datafile is done, mdfile is almost done

Details: * All functions work for -datafile case for both post create and member attr options. * For -mdfile, readdirplus do not work yet; a msgpair needs to be deployed to osd and pvfs simultaneously. * sys-osd-dir.sm can be fixed for this purpose
SNSL · Jul 22, 2012 · 581b7e8 · 581b7e8
1 parent 7bda42b
commit 581b7e8
Show file tree

Hide file tree

Showing 14 changed files with 210 additions and 307 deletions.
diff --git a/config.save b/config.save
@@ -525,17 +525,17 @@ s,@ECHO_C@,,;t t
 s,@ECHO_N@,-n,;t t
 s,@ECHO_T@,,;t t
 s,@LIBS@, -lcrypto -lssl -ldl,;t t
-s,@PVFS2_VERSION@,2.8.6-orangefs-2012-07-13-043849,;t t
+s,@PVFS2_VERSION@,2.8.6-orangefs-2012-07-19-212817,;t t
 s,@PVFS2_VERSION_MAJOR@,2,;t t
 s,@PVFS2_VERSION_MINOR@,8,;t t
 s,@PVFS2_VERSION_SUB@,6,;t t
-s,@build@,i686-pc-linux-gnu,;t t
-s,@build_cpu@,i686,;t t
-s,@build_vendor@,pc,;t t
+s,@build@,x86_64-unknown-linux-gnu,;t t
+s,@build_cpu@,x86_64,;t t
+s,@build_vendor@,unknown,;t t
 s,@build_os@,linux-gnu,;t t
-s,@host@,i686-pc-linux-gnu,;t t
-s,@host_cpu@,i686,;t t
-s,@host_vendor@,pc,;t t
+s,@host@,x86_64-unknown-linux-gnu,;t t
+s,@host_cpu@,x86_64,;t t
+s,@host_vendor@,unknown,;t t
 s,@host_os@,linux-gnu,;t t
 s,@CC@,gcc,;t t
 s,@CFLAGS@, -g -O2,;t t
@@ -983,14 +983,14 @@ CEOF
 t clr
 : clr
 ${ac_dA}HAVE_ARPA_INET_H${ac_dB}HAVE_ARPA_INET_H${ac_dC}1${ac_dD}
-${ac_dA}SIZEOF_LONG_INT${ac_dB}SIZEOF_LONG_INT${ac_dC}4${ac_dD}
+${ac_dA}SIZEOF_LONG_INT${ac_dB}SIZEOF_LONG_INT${ac_dC}8${ac_dD}
 ${ac_dA}WITH_OPENSSL${ac_dB}WITH_OPENSSL${ac_dC}1${ac_dD}
 ${ac_dA}HAVE_OPENSSL_EVP_H${ac_dB}HAVE_OPENSSL_EVP_H${ac_dC}1${ac_dD}
 ${ac_dA}HAVE_OPENSSL_CRYPTO_H${ac_dB}HAVE_OPENSSL_CRYPTO_H${ac_dC}1${ac_dD}
 ${ac_dA}HAVE_OPENSSL_SHA_H${ac_dB}HAVE_OPENSSL_SHA_H${ac_dC}1${ac_dD}
 ${ac_dA}HAVE_AIOCB_ERROR_CODE${ac_dB}HAVE_AIOCB_ERROR_CODE${ac_dC}1${ac_dD}
 ${ac_dA}HAVE_AIOCB_RETURN_VALUE${ac_dB}HAVE_AIOCB_RETURN_VALUE${ac_dC}1${ac_dD}
-${ac_dA}SIZEOF_VOID_P${ac_dB}SIZEOF_VOID_P${ac_dC}4${ac_dD}
+${ac_dA}SIZEOF_VOID_P${ac_dB}SIZEOF_VOID_P${ac_dC}8${ac_dD}
 ${ac_dA}HAVE_SYS_EPOLL_H${ac_dB}HAVE_SYS_EPOLL_H${ac_dC}1${ac_dD}
 ${ac_dA}PVFS_USRINT_BUILD${ac_dB}PVFS_USRINT_BUILD${ac_dC}1${ac_dD}
 ${ac_dA}PVFS_USRINT_KMOUNT${ac_dB}PVFS_USRINT_KMOUNT${ac_dC}0${ac_dD}
@@ -1075,14 +1075,14 @@ CEOF
 t clr
 : clr
 ${ac_uA}HAVE_ARPA_INET_H${ac_uB}HAVE_ARPA_INET_H${ac_uC}1${ac_uD}
-${ac_uA}SIZEOF_LONG_INT${ac_uB}SIZEOF_LONG_INT${ac_uC}4${ac_uD}
+${ac_uA}SIZEOF_LONG_INT${ac_uB}SIZEOF_LONG_INT${ac_uC}8${ac_uD}
 ${ac_uA}WITH_OPENSSL${ac_uB}WITH_OPENSSL${ac_uC}1${ac_uD}
 ${ac_uA}HAVE_OPENSSL_EVP_H${ac_uB}HAVE_OPENSSL_EVP_H${ac_uC}1${ac_uD}
 ${ac_uA}HAVE_OPENSSL_CRYPTO_H${ac_uB}HAVE_OPENSSL_CRYPTO_H${ac_uC}1${ac_uD}
 ${ac_uA}HAVE_OPENSSL_SHA_H${ac_uB}HAVE_OPENSSL_SHA_H${ac_uC}1${ac_uD}
 ${ac_uA}HAVE_AIOCB_ERROR_CODE${ac_uB}HAVE_AIOCB_ERROR_CODE${ac_uC}1${ac_uD}
 ${ac_uA}HAVE_AIOCB_RETURN_VALUE${ac_uB}HAVE_AIOCB_RETURN_VALUE${ac_uC}1${ac_uD}
-${ac_uA}SIZEOF_VOID_P${ac_uB}SIZEOF_VOID_P${ac_uC}4${ac_uD}
+${ac_uA}SIZEOF_VOID_P${ac_uB}SIZEOF_VOID_P${ac_uC}8${ac_uD}
 ${ac_uA}HAVE_SYS_EPOLL_H${ac_uB}HAVE_SYS_EPOLL_H${ac_uC}1${ac_uD}
 ${ac_uA}PVFS_USRINT_BUILD${ac_uB}PVFS_USRINT_BUILD${ac_uC}1${ac_uD}
 ${ac_uA}PVFS_USRINT_KMOUNT${ac_uB}PVFS_USRINT_KMOUNT${ac_uC}0${ac_uD}

diff --git a/src/apps/admin/pvfs2-chmod.c b/src/apps/admin/pvfs2-chmod.c
@@ -155,7 +155,7 @@ int pvfs2_chmod (PVFS_permissions perms, char *destfile) {
   }
   memset(&resp_getattr,0,sizeof(PVFS_sysresp_getattr));
   attrmask = (PVFS_ATTR_SYS_ALL_SETABLE);
-    
+
   ret = PVFS_sys_getattr(resp_lookup.ref,attrmask,&credentials,&resp_getattr, NULL);
   if (ret < 0) 
   {
@@ -167,7 +167,7 @@ int pvfs2_chmod (PVFS_permissions perms, char *destfile) {
 
   new_attr.perms = perms;
   new_attr.mask = PVFS_ATTR_SYS_PERM;
- 
+
   ret = PVFS_sys_setattr(resp_lookup.ref,new_attr,&credentials, NULL);
   if (ret < 0) 
   {

diff --git a/src/client/sysint/remove.sm b/src/client/sysint/remove.sm
@@ -96,7 +96,7 @@ nested machine pvfs2_client_remove_helper_sm
     state object_remove_setup_msgpair
     {
         run remove_object_remove_setup_msgpair;
-        OSD_MDFILE_MSGPAIR => remove_helper_cleanup;
+        OSD_MDFILE_MSGPAIR => remove_collection;
         OSD_MSGPAIR => object_remove_xfer_osd_msgpair;
         success => object_remove_xfer_msgpair;
         default => object_remove_failure;
@@ -150,12 +150,14 @@ static PINT_sm_action remove_getattr_init(
         struct PINT_smcb *smcb, job_status_s *js_p)
 {
     struct PINT_client_sm *sm_p = PINT_sm_frame(smcb, PINT_FRAME_CURRENT);
+
     PINT_SM_GETATTR_STATE_FILL(
         sm_p->getattr,
         sm_p->object_ref,
         PVFS_ATTR_META_ALL|PVFS_ATTR_COMMON_TYPE,
         PVFS_TYPE_NONE,
         0);
+
     return SM_ACTION_COMPLETE;
 }
 
@@ -167,11 +169,17 @@ static PINT_sm_action remove_getattr_analyze_results(
     attr = &sm_p->getattr.attr;
     assert(attr);
 
+    struct server_configuration_s *server_config;
+
+    server_config = PINT_get_server_config_struct(
+        sm_p->object_ref.fs_id);
+    PINT_put_server_config_struct(server_config);
+
     switch(attr->objtype)
     {
 	case PVFS_TYPE_METAFILE:
-	    assert(attr->mask & PVFS_ATTR_META_DFILES);
-	    assert(attr->u.meta.dfile_count > 0);
+            assert(attr->mask & PVFS_ATTR_META_DFILES);
+            assert(attr->u.meta.dfile_count > 0);
 
 	    gossip_debug(GOSSIP_CLIENT_DEBUG, "%s: must remove %d datafiles\n",
                          __func__, attr->u.meta.dfile_count);
@@ -219,7 +227,7 @@ static PINT_sm_action remove_datafile_remove_setup_msgpair(
 
     gossip_debug(GOSSIP_CLIENT_DEBUG,
                  "remove state: datafile_remove_setup_msgpair\n");
-
+   
     attr = &sm_p->getattr.attr;
     assert(attr);