Changeset 8648

Timestamp:

12/06/10 16:26:00 (2 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.)

Location:

branches/Orange-Elaine-Distr-Dir-Branch/src

Files:

• apps/admin/pvfs2-genconfig (modified) (1 diff)
• apps/admin/pvfs2-mkdir.c (modified) (15 diffs)
• client/sysint/sys-mkdir.sm (modified) (2 diffs)
• common/misc/server-config.c (modified) (3 diffs)
• common/misc/server-config.h (modified) (1 diff)
• server/mkdir.sm (modified) (2 diffs)

branches/Orange-Elaine-Distr-Dir-Branch/src/apps/admin/pvfs2-genconfig

@@ -214 +214 @@
     print $target "\tPrecreateBatchSize 0,32,512,32,32,32,0\n";
     print $target "\tPrecreateLowThreshold 0,16,256,16,16,16,0\n";
+    print $target "\tInitNumDirdataHandles 2\n";
 
     if(defined($default_storage))

branches/Orange-Elaine-Distr-Dir-Branch/src/apps/admin/pvfs2-mkdir.c

@@ -39 +39 @@
     int     numdirs; /* number of directories to create */
     int     mode;    /* mode of directories */
+    int     init_num_dirdata; /* init num of dirdata handles */
     int     verbose; 
     int     make_parent_dirs; /* Create missing parents */
@@ -49 +50 @@
 static void enable_parents(struct options * opts);
 static int read_mode(struct options * opts, const char * buffer);
+static int read_init_num_dirdata(struct options * opts, const char * buffer);
 static int make_directory(PVFS_credentials     * credentials,
                           const PVFS_fs_id       fs_id,
                           const int              mode,
+                          const int              init_num_dirdata,
                           const char           * dir,
                           const char           * pvfs_path,
@@ -140 +143 @@
                              pfs_id[i],
                              user_opts.mode,
+                             user_opts.init_num_dirdata,
                              user_opts.dir_array[i],
                              pvfs_path[i],
@@ -185 +189 @@
                           const PVFS_fs_id       fs_id,
                           const int              mode,
+                          const int              init_num_dirdata,
                           const char           * dir,
                           const char           * pvfs_path,
@@ -230 +235 @@
     attr.perms = mode;
     attr.mask = (PVFS_ATTR_SYS_ALL_SETABLE);
+    /* sys_attr.dirdata_count is meant to be the total number of dirdata handles.
+     * introduced for pvfs2_fs_dump & pvfs2_fsck.
+     * here it's used to pass the initial number of dirdata handles 
+     */
+    attr.dirdata_count = init_num_dirdata;
         
     /* Clear out any info from previous calls */
@@ -265 +275 @@
                              fs_id,
                              mode,
+                             init_num_dirdata,
                              dirname(realpath),
                              dirname(parent_dir),
@@ -299 +310 @@
     {
         fprintf(stderr, "Creating Directory\n");
-        fprintf(stderr, "\t basename_ptr = [%s]\n", basename_ptr);
-        fprintf(stderr, "\t fs_id       = [%d]\n", fs_id);
-        fprintf(stderr, "\t Mode        = [%o]\n", mode);
-        fprintf(stderr, "\t DirName     = [%s]\n", dir);
-        fprintf(stderr, "\t pvfs path   = [%s]\n", pvfs_path);
+        fprintf(stderr, "\t basename_ptr    = [%s]\n", basename_ptr);
+        fprintf(stderr, "\t fs_id           = [%d]\n", fs_id);
+        fprintf(stderr, "\t Mode            = [%o]\n", mode);
+        fprintf(stderr, "\t InitNumDirdata  = [%d]\n", init_num_dirdata);
+        fprintf(stderr, "\t DirName         = [%s]\n", dir);
+        fprintf(stderr, "\t pvfs path       = [%s]\n", pvfs_path);
 
         fprintf(stdout, "Directory Attributes\n");
@@ -335 +347 @@
 {
     int i = 0, ret = 0,option_index = 0, mode_requested = 0;
+    int init_num_dirdata_requested = 0;
     const char * cur_option = NULL;
-    char flags[] = "hm:pvV";  /* Options available on command line */
+    char flags[] = "hm:n:pvV";  /* Options available on command line */
 
     static struct option long_opts[] =
@@ -344 +357 @@
         {"verbose",0,0,0},
         {"mode",1,0,0},
+        {"init-num-dirdata",1,0,0},
         {0,0,0,0}
     };
@@ -383 +397 @@
                     mode_requested = 1;
                 }
+                else if(strcmp("init-num-dirdata", cur_option) == 0)
+                {
+                    ret = read_init_num_dirdata(opts, optarg);
+                    if(ret == 0)
+                    {
+                        fprintf(stderr, "Unable to read initial number of dirdata handles\n");
+                        usage(argc, argv);
+                        return(-1);
+                    }
+                    init_num_dirdata_requested = 1;
+                }
                 else
                 {
@@ -404 +429 @@
                 }
                 mode_requested = 1;
+                break;
+
+            case 'n': /* --init-num-dirdata */
+                ret = read_init_num_dirdata(opts, optarg);
+                if(ret == 0)
+                {
+                    fprintf(stderr, "Unable to read initial number of dirdata handles\n");
+                    usage(argc, argv);
+                    return(-1);
+                }
+                init_num_dirdata_requested = 1;
                 break;
 
@@ -460 +496 @@
     }
     
+    if(!init_num_dirdata_requested)
+    {
+        opts->init_num_dirdata = 0;
+    }
+    else if(opts->init_num_dirdata <=0 )
+    {
+        fprintf(stderr, "init-num-dirdata has to be a positive integer!\n"); 
+        usage(argc, argv);
+        return(-1);
+    }
+
     /* Allocate memory to hold the filenames */
     opts->dir_array = (char **)calloc(opts->numdirs, sizeof(char *));
@@ -478 +525 @@
     {
         fprintf(stdout, "Options Specified\n");
-        fprintf(stdout, "\t Verbose  [%d]\n", opts->verbose);
-        fprintf(stdout, "\t Mode     [%o]\n", opts->mode);
-        fprintf(stdout, "\t Num Dirs [%d]\n", opts->numdirs);
+        fprintf(stdout, "\t Verbose             [%d]\n", opts->verbose);
+        fprintf(stdout, "\t Mode                [%o]\n", opts->mode);
+        fprintf(stdout, "\t Init Num Dirdata    [%d]\n", opts->init_num_dirdata);
+        fprintf(stdout, "\t Num Dirs            [%d]\n", opts->numdirs);
         for(i=0; i<opts->numdirs; i++)
         {
@@ -494 +542 @@
     fprintf(stderr, "Create the DIRECTORY(ies), if they do not already exist.\n\n");
 
-    fprintf(stderr,"  -m, --mode          set permission mode (as in chmod), "
-                                          "not rwxrwxrwx - umask\n");
-    fprintf(stderr,"  -p, --parents       make parent directories as needed\n");
-    fprintf(stderr,"  -V, --verbose       turns on verbose messages\n");
-    fprintf(stderr,"  -v, --version       output version information and exit\n");
-    fprintf(stderr,"  -h, --help          print help\n");
+    fprintf(stderr,"  -m, --mode                set permission mode (as in chmod), "
+                                                "not rwxrwxrwx - umask\n");
+    fprintf(stderr,"  -n, --init-num-dirdata    set initial number of dirdata handles for the directory,\n");
+    fprintf(stderr,"  -p, --parents             make parent directories as needed\n");
+    fprintf(stderr,"  -V, --verbose             turns on verbose messages\n");
+    fprintf(stderr,"  -v, --version             output version information and exit\n");
+    fprintf(stderr,"  -h, --help                print help\n");
     return;
 }
@@ -518 +567 @@
     
     ret = sscanf(buffer, "%o", &opts->mode);
+    
+    return(ret);
+}
+
+static int read_init_num_dirdata(struct options * opts, const char * buffer)
+{
+    int ret = 0;
+    
+    ret = sscanf(buffer, "%d", &opts->init_num_dirdata);
     
     return(ret);

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;

branches/Orange-Elaine-Distr-Dir-Branch/src/common/misc/server-config.c

@@ -111 +111 @@
 static DOTCONF_CB(get_precreate_batch_size);
 static DOTCONF_CB(get_precreate_low_threshold);
+static DOTCONF_CB(get_init_num_dirdata_handles);
 static DOTCONF_CB(get_client_retry_limit);
 static DOTCONF_CB(get_client_retry_delay);
@@ -690 +691 @@
          CTX_DEFAULTS|CTX_SERVER_OPTIONS, "0, 16, 256, 16, 16, 16, 0"},
 
+     /* Initial number of dirdata handles when creating a new directory.
+      * TODO: determine the default value, use 2 as a start
+      */
+     {"InitNumDirdataHandles",ARG_INT, get_init_num_dirdata_handles,NULL,
+         CTX_DEFAULTS|CTX_SERVER_OPTIONS, "2"},
+
     /* Specifies if file stuffing should be enabled or not.  Default is
      * enabled; this option is only provided for benchmarking purposes 
@@ -1697 +1704 @@
     return NULL;
 }
+
+DOTCONF_CB(get_init_num_dirdata_handles)
+{
+    struct server_configuration_s *config_s = 
+        (struct server_configuration_s *)cmd->context;
+    if(config_s->configuration_context == CTX_SERVER_OPTIONS &&
+       config_s->my_server_options == 0)
+    {
+        return NULL;
+    }
+    if(cmd->data.value <= 0)
+    {
+        return "InitNumDirdataHandles has to be a positive integer!\n";
+    }
+    config_s->init_num_dirdata_handles = cmd->data.value;
+    return NULL;
+}
+
+
 
 DOTCONF_CB(get_server_job_flow_timeout)

branches/Orange-Elaine-Distr-Dir-Branch/src/common/misc/server-config.h

@@ -162 +162 @@
     uint32_t  *precreate_batch_size;    /* batch size for each ds type */
     uint32_t  *precreate_low_threshold; /* threshold for each ds type */
+    uint32_t init_num_dirdata_handles; /* initial number of dirdata handles when creating a new directory */
     char *logfile;                  /* what log file to write to */
     char *logtype;                  /* "file" or "syslog" destination */

branches/Orange-Elaine-Distr-Dir-Branch/src/server/mkdir.sm

@@ -230 +230 @@
     PVFS_object_attr *attr;
     int num_total_dirdata_servers, num_initial_dirdata_servers;
+    server_configuration_s *user_opts = get_server_config_struct();
     int ret = -1;
     unsigned char *c;
@@ -250 +251 @@
         num_total_dirdata_servers;
 
-    /* TODO: initial active # of dirdata servers = max(client_req, config_files) */
-    num_initial_dirdata_servers = s_op->req->u.mkdir.num_dirent_files_req;
+    /* TODO: if received >0, use; else use config_file value,*/
+    if(s_op->req->u.mkdir.num_dirent_files_req > 0)
+    {
+        num_initial_dirdata_servers = s_op->req->u.mkdir.num_dirent_files_req;
+    }
+    else
+    {
+        num_initial_dirdata_servers = user_opts->init_num_dirdata_handles;
+    }
 
     /* will do the same check in PINT_init_dist_dir_state,