Changeset 8648 for branches/Orange-Elaine-Distr-Dir-Branch/src/client/sysint/sys-mkdir.sm

Timestamp:

12/06/10 16:26:00 (3 years ago)

Author:

shuangy

Message:

1. add >InitNumDirdataHandles?< field to fs_config and default value set to 2. 2. add command line options >-n, --init-num-dirdata< to pvfs2-mkdir to set initial number of dirdata handles for a directory. (not yet applied to kernel module.)

Files:

• branches/Orange-Elaine-Distr-Dir-Branch/src/client/sysint/sys-mkdir.sm (modified) (2 diffs)

branches/Orange-Elaine-Distr-Dir-Branch/src/client/sysint/sys-mkdir.sm

@@ -608 +608 @@
     PVFS_object_attr *attr = NULL;
     int i;
-    int ret = -PVFS_EINVAL;
 
     gossip_debug(GOSSIP_CLIENT_DEBUG, "mkdir state: parent_getattr_inspect\n");
@@ -637 +636 @@
     }
 
-    /* TODO: use settings from the config file, or from parent dir? */
-    /* Determine the number of dirent files. For now just assume we will use
-     * all the metadata servers.
-     */
-    ret = PINT_cached_config_get_num_meta(sm_p->object_ref.fs_id,
-                                            &sm_p->u.mkdir.num_dirent_files);
-    if(ret < 0)
-    {
-        gossip_err("Error: failed to get number of metadata servers\n");
-        js_p->error_code = ret;
-        return SM_ACTION_COMPLETE;
-    }
-
-#if 0
     /* set value of num_dirent_files, 
-     * max(max(parent_num, command_line) [client], config_file)[server] */
-    sm_p->u.mkdir.num_dirent_files = attr->u.dir.dist_dir_attr.num_servers;
-
-    /* TODO: get command line value of NumDirdata */
+     * not considering parent_# since it doesn't have direct relation. 
+     * here, if user has inputs, send it, otherwise, send 0.
+     * on server side, if met 0, use config_file data, otherwise use user set value   */
+
+    /* get command line value of NumDirdata from sys_attr */
+    sm_p->u.mkdir.num_dirent_files = sm_p->u.mkdir.sys_attr.dirdata_count;
+
 
     /* note: if select less # of dirdata servers, need to modify getattr, etc. to contact only active servers, not all dirdata servers */
-#endif
 
     return SM_ACTION_COMPLETE;