Changeset 8660

Timestamp:

12/13/10 16:17:00 (2 years ago)

Author:

shuangy

Message:

1. sys-getattr only contact active dirdata servers. 2. cleanup mkdir. 3. fix a memory leak in PINT_free_object_attr.

Location:

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

Files:

• client/sysint/client-state-machine.h (modified) (1 diff)
• client/sysint/sys-getattr.sm (modified) (12 diffs)
• client/sysint/sys-readdir.sm (modified) (1 diff)
• common/misc/dist-dir-utils.c (modified) (1 diff)
• common/misc/dist-dir-utils.h (modified) (1 diff)
• common/misc/pint-util.c (modified) (1 diff)
• server/mkdir.sm (modified) (3 diffs)

branches/Orange-Elaine-Distr-Dir-Branch/src/client/sysint/client-state-machine.h

@@ -477 +477 @@
      * now only used with sys-readdir.sm */
     int keep_size_array; 
+    int *active_dirdata_index;
 
     PVFS_size * size_array;

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

@@ -25 +25 @@
 #include "pvfs2-internal.h"
 #include "pvfs2-types-debug.h"
+#include "dist-dir-utils.h"
 
 /* pvfs2_client_getattr_sm
@@ -705 +706 @@
         {
             uint32_t dirent_file_count_i;
+            int tmp_i;
+            unsigned char *c;
 
             /* dirent_count will be collected later */
@@ -711 +714 @@
                 "dfile_count = %d "
                 "dist_name_len = %d "
-                "dist_params_len = %d ",
-                /* "dirent_count = %llu ", */
+                "dist_params_len = %d\n ",
                 attr,
                 attr->u.dir.hint.dfile_count,
                 attr->u.dir.hint.dist_name_len,
                 attr->u.dir.hint.dist_params_len);
-                /* llu(attr->u.dir.dirent_count) */
 
             if(attr->mask & PVFS_ATTR_DIR_DISTDIR_ATTR)
             {
+
+                gossip_debug(GOSSIP_CLIENT_DEBUG, 
+                        "sys-getattr: dist-dir-attr "
+                        "with tree_height=%d, num_servers=%d, bitmap_size=%d, "
+                        "split_size=%d, server_no=%d and branch_level=%d\n",
+                        attr->u.dir.dist_dir_attr.tree_height,
+                        attr->u.dir.dist_dir_attr.num_servers,
+                        attr->u.dir.dist_dir_attr.bitmap_size,
+                        attr->u.dir.dist_dir_attr.split_size,
+                        attr->u.dir.dist_dir_attr.server_no,
+                        attr->u.dir.dist_dir_attr.branch_level);
+
+                /* gossip bitmap */
                 gossip_debug(GOSSIP_CLIENT_DEBUG,
-                        "dirdata_server_count = %d\n",
-                        attr->u.dir.dist_dir_attr.num_servers);
-
-                /* !!! change more later */
+                        "sys-getattr: dist_dir_bitmap as:\n");
+                for(tmp_i = attr->u.dir.dist_dir_attr.bitmap_size - 1;
+                        tmp_i >= 0 ; tmp_i--)
+                {
+                    c = (unsigned char *)(attr->u.dir.dist_dir_bitmap + tmp_i);
+                    gossip_debug(GOSSIP_MKDIR_DEBUG,
+                            " i=%d : %02x %02x %02x %02x\n",
+                            tmp_i, c[3], c[2], c[1], c[0]);
+                }
+                gossip_debug(GOSSIP_CLIENT_DEBUG, "\n");
+
+                /* gossip dirdata handles */
+                gossip_debug(GOSSIP_CLIENT_DEBUG,
+                        "sys-getattr: dirdata_handles as:\n");
                 for (dirent_file_count_i = 0;
                         dirent_file_count_i < 
@@ -1237 +1261 @@
     PVFS_object_attr *attr = NULL;
     PINT_sm_msgpair_state *msg_p = NULL;
+    int tmp_index, cur_index;
 
     js_p->error_code = 0;
@@ -1249 +1274 @@
             attr->u.dir.dist_dir_attr.num_servers);
 
+    sm_p->getattr.active_dirdata_index = (int *)malloc(
+            sizeof(*sm_p->getattr.active_dirdata_index) *
+            attr->u.dir.dist_dir_attr.num_servers);
+
+    if(!sm_p->getattr.active_dirdata_index)
+    {
+        js_p->error_code = -PVFS_ENOMEM;
+        return SM_ACTION_COMPLETE;
+    }
+
+
+    /* find out active dirdata handles */
+    tmp_index = 0;
+    for(i=0; i<attr->u.dir.dist_dir_attr.num_servers; i++)
+    {
+        if(PINT_is_dist_dir_bucket_active(&attr->u.dir.dist_dir_attr,
+                    attr->u.dir.dist_dir_bitmap, i))
+        {
+            sm_p->getattr.active_dirdata_index[tmp_index] = i;
+            tmp_index++;
+        }
+    }
+    assert(tmp_index > 0);
+
     /* initialize msgpair array */
     ret = PINT_msgpairarray_init(&sm_p->msgarray_op, 
-            attr->u.dir.dist_dir_attr.num_servers);
+            tmp_index);
     if(ret != 0)
     {
@@ -1261 +1310 @@
     foreach_msgpair(&sm_p->msgarray_op, msg_p, i)
     {
+        cur_index = sm_p->getattr.active_dirdata_index[i];
 
         gossip_debug(GOSSIP_CLIENT_DEBUG,
-                     "getattr: posting dirdata getattr[%d] (%lld,%d)\n",
-                     i, llu(attr->u.dir.dirdata_handles[i]),
+                     "getattr: posting dirdata getattr[%d] ([%d]:%lld,%d)\n",
+                     i, cur_index,
+                     llu(attr->u.dir.dirdata_handles[cur_index]),
                      sm_p->getattr.object_ref.fs_id);
 
@@ -1271 +1322 @@
             *sm_p->cred_p,
             sm_p->getattr.object_ref.fs_id,
-            attr->u.dir.dirdata_handles[i],
+            attr->u.dir.dirdata_handles[cur_index],
             PVFS_ATTR_COMMON_ALL|PVFS_ATTR_DIR_DIRENT_COUNT, /* only interested in timestamp and dirent_count */
             sm_p->hints);
@@ -1277 +1328 @@
         /* fill in msgpair structure components */
         msg_p->fs_id = sm_p->getattr.object_ref.fs_id;
-        msg_p->handle = attr->u.dir.dirdata_handles[i];
+        msg_p->handle = attr->u.dir.dirdata_handles[cur_index];
         msg_p->retry_flag = PVFS_MSGPAIR_RETRY;
         msg_p->comp_fn = getattr_dirdata_getattr_comp_fn;
@@ -1305 +1356 @@
     PVFS_object_attr *attr_p = NULL;
     PVFS_object_attr *resp_attr_p = NULL;
+    int cur_index;
 
     gossip_debug(GOSSIP_GETATTR_DEBUG,
@@ -1320 +1372 @@
     attr_p = &sm_p->getattr.attr;
     resp_attr_p = &resp_p->u.getattr.attr;
+    cur_index = sm_p->getattr.active_dirdata_index[index];
 
     assert(resp_attr_p->objtype == PVFS_TYPE_DIRDATA);
     /* also assert timestamp? */
     assert(resp_attr_p->mask & PVFS_ATTR_DIR_DIRENT_COUNT);
-
-    gossip_debug(GOSSIP_CLIENT_DEBUG, "dirdata getattr[%d] returns attrs: "
+    assert( (cur_index >= 0) && 
+            (cur_index < attr_p->u.dir.dist_dir_attr.num_servers));
+
+    gossip_debug(GOSSIP_CLIENT_DEBUG, "dirdata getattr[%d] (#[%d]) returns attrs: "
             "[dirent_count=%llu, atime = %llu, mtime = %llu, ctime = %llu]\n",
-            index, 
+            index, cur_index,
             llu(resp_attr_p->u.dir.dirent_count),
             llu(resp_attr_p->atime),
@@ -1334 +1389 @@
 
     /* update timestamp and dirent_count */
-    sm_p->getattr.size_array[index] = resp_attr_p->u.dir.dirent_count; 
+    sm_p->getattr.size_array[cur_index] = resp_attr_p->u.dir.dirent_count; 
     attr_p->u.dir.dirent_count += resp_attr_p->u.dir.dirent_count;
     if(attr_p->atime < resp_attr_p->atime)
@@ -1367 +1422 @@
     /* cleanup tree request */
     PINT_msgpairarray_destroy(&sm_p->msgarray_op);
+
+    if(sm_p->getattr.active_dirdata_index)
+    {
+        free(sm_p->getattr.active_dirdata_index);
+    }
 
     return SM_ACTION_COMPLETE;

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

@@ -297 +297 @@
     {
         readdir_reentry = 1;
-
-#if 0
-        /* update dirdata_index, the comp_fn is not updating the dirdata_index */
-        sm_p->u.readdir.dirdata_index += 
-            (sm_p->u.readdir.num_dirdata_needed - 1);
-        gossip_debug(GOSSIP_READDIR_DEBUG, "readdir: "
-                "re-entering msg_array_setup! update dirdata_index to %d !\n", 
-                sm_p->u.readdir.dirdata_index);
-#endif
     }
 

branches/Orange-Elaine-Distr-Dir-Branch/src/common/misc/dist-dir-utils.c

@@ -137 +137 @@
 }
 
+/* functions to test whether a dirdata server is active or not. 
+ * will return 0 if server_no is out of bound or server is inactive.
+ */
+int PINT_is_dist_dir_bucket_active(
+                const PVFS_dist_dir_attr *dist_dir_attr_p, 
+                const PVFS_dist_dir_bitmap bitmap,
+                const int server_no)
+{
+    if((server_no < 0) ||
+            (server_no >= dist_dir_attr_p->num_servers))
+    {
+        return 0;
+    }
+
+    if(TST_BIT(bitmap, server_no))
+    {
+        return 1;
+    }
+    else
+    {
+        return 0;
+    }
+
+}
 
 /*

branches/Orange-Elaine-Distr-Dir-Branch/src/common/misc/dist-dir-utils.h

@@ -44 +44 @@
                 const int server_no, 
                 const int pre_dsg_num_server);
+int PINT_is_dist_dir_bucket_active(
+                const PVFS_dist_dir_attr *dist_dir_attr_p, 
+                const PVFS_dist_dir_bitmap bitmap,
+                const int server_no); 
 int PINT_find_dist_dir_bucket(
                 const PVFS_dist_dir_hash_type hash, 

branches/Orange-Elaine-Distr-Dir-Branch/src/common/misc/pint-util.c

@@ -415 +415 @@
                 attr->u.dir.hint.dist_params = NULL;
             }
+        }
+        if (attr->mask & PVFS_ATTR_DIR_DISTDIR_ATTR)
+        {
             if (attr->u.dir.dist_dir_bitmap)
             {

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

@@ -42 +42 @@
     {
         run mkdir_create_dist_dir_struct;
-        success => select_dirdata_servers;
-        default => err_msg;
-    }
-
-    state select_dirdata_servers
-    {
-        run mkdir_select_dirdata_servers;
         success => create_local_dirdata_dspace;
         default => err_msg;
@@ -251 +244 @@
         num_total_dirdata_servers;
 
-    /* TODO: if received >0, use; else use config_file value,*/
+    /* if received >0, use; else use config_file value,*/
     if(s_op->req->u.mkdir.num_dirent_files_req > 0)
     {
@@ -323 +316 @@
     return SM_ACTION_COMPLETE; 
 }
-
-
-static PINT_sm_action mkdir_select_dirdata_servers(
-        struct PINT_smcb *smcb, job_status_s *js_p)
-{
-    /*
-    struct PINT_server_op *s_op = PINT_sm_frame(smcb, PINT_FRAME_CURRENT);
-    PVFS_object_attr *attr;
-    */
-
-/* not selecting servers now, suppose has dirdata on every metadata server */
-
-        /******** if use the function in create.sm to get server list:
-*
-int PINT_cached_config_get_server_list(
-    PVFS_fs_id fs_id,
-    PINT_dist *dist,
-    int num_dfiles_req,
-    PVFS_sys_layout *layout,
-    const char ***server_names,
-    int *server_count)
-
-1. need to provide dist & layout
-2. server_count might be different from num_dfiles_req, then better put create dist-dir-struct after the servers selection function.
-
-****************/
-
-
-        return SM_ACTION_COMPLETE;
-
-}
-