Changeset 8483 for branches/Orange-Elaine-Distr-Dir-Branch/src/client/sysint/mgmt-remove-dirent.sm

Timestamp:

08/26/10 19:46:51 (3 years ago)

Author:

shuangy

Message:

1. add dist-dir-struct to root handle and lost+found handle
2. add dirdata bucket selection to several state machines, however, sys-rename and sys-readdir are not finished yet. There might be other state machines missing.
3. compilable, not expect to run correctly yet.
4. more to change.

Files:

• branches/Orange-Elaine-Distr-Dir-Branch/src/client/sysint/mgmt-remove-dirent.sm (modified) (3 diffs)

branches/Orange-Elaine-Distr-Dir-Branch/src/client/sysint/mgmt-remove-dirent.sm

@@ -26 +26 @@
 #include "PINT-reqproto-encode.h"
 #include "pvfs2-internal.h"
+#include "dist-dir-utils.h"
 
 extern job_context_id pint_client_sm_context;
@@ -183 +184 @@
     int ret = -PVFS_EINVAL;
     PINT_sm_msgpair_state *msg_p = NULL;
+    PVFS_dist_dir_hash_type dirdata_hash;
+    int dirdata_server_index;
 
     js_p->error_code = 0;
+
+    /* find the hash value and the dist dir bucket */
+    dirdata_hash = PINT_encrypt_dirdata(sm_p->u.mgmt_remove_dirent.entry);
+    gossip_debug(GOSSIP_REMOVE_DEBUG, " encrypt dirent %s into hash value %llu.\n",
+            sm_p->u.mgmt_remove_dirent.entry,
+            llu(dirdata_hash));
+
+    dirdata_server_index = 
+        PINT_find_dist_dir_bucket(dirdata_hash,
+            &sm_p->getattr.attr.u.dir.dist_dir_attr,
+            sm_p->getattr.attr.u.dir.dist_dir_bitmap);
+    gossip_debug(GOSSIP_REMOVE_DEBUG, " selecting bucket No.%d from dist_dir_bitmap.\n",
+            dirdata_server_index);
+
 
     PINT_msgpair_init(&sm_p->msgarray_op);
     msg_p = &sm_p->msgarray_op.msgpair;
 
-    /* TODO: Need to find the correct dirent_handle */
     /* TODO: Need to call PINT_free_object_attr? */
      PINT_SERVREQ_MGMT_REMOVE_DIRENT_FILL(
@@ -196 +212 @@
         sm_p->parent_ref.fs_id,
         sm_p->parent_ref.handle,
-        sm_p->getattr.attr.u.dir.dirdata_handles[0],
+        sm_p->getattr.attr.u.dir.dirdata_handles[dirdata_server_index],
         sm_p->u.mgmt_remove_dirent.entry,
         sm_p->hints);