[PVFS2-CVS] commit by pcarns in pvfs2/src/client/sysint: sys-remove.sm

CVS commit program cvs at parl.clemson.edu
Thu May 6 14:47:30 EDT 2004


Update of /projects/cvsroot/pvfs2/src/client/sysint
In directory parlweb:/tmp/cvs-serv8780

Modified Files:
	sys-remove.sm 
Log Message:
allow getattr step to retry (using msgpair mechanism), if getattr fails
return success but issue warning about corruption


Index: sys-remove.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/sys-remove.sm,v
diff -p -u -r1.56 -r1.57
--- sys-remove.sm	5 May 2004 22:11:39 -0000	1.56
+++ sys-remove.sm	6 May 2004 17:47:30 -0000	1.57
@@ -365,7 +365,7 @@ static int remove_getattr_setup_msgpair(
     /* fill in msgpair structure components */
     sm_p->msgpair.fs_id = sm_p->u.remove.object_ref.fs_id;
     sm_p->msgpair.handle = sm_p->u.remove.object_ref.handle;
-    sm_p->msgpair.retry_flag = PVFS_MSGPAIR_NO_RETRY;
+    sm_p->msgpair.retry_flag = PVFS_MSGPAIR_RETRY;
     sm_p->msgpair.comp_fn = remove_getattr_comp_fn;
 
     ret = PINT_bucket_map_to_server(&sm_p->msgpair.svr_addr,
@@ -807,6 +807,12 @@ static int remove_getattr_failure(PINT_c
 				  job_status_s *js_p)
 {
     gossip_debug(GOSSIP_CLIENT_DEBUG, "remove state: getattr_failure\n");
+
+    gossip_err("WARNING: PVFS_sys_remove() encountered an error which "
+    "may lead to inconsistent state.\n");
+    gossip_err("WARNING: PVFS2 fsck (if available) may be needed.\n");
+    js_p->error_code = 0;
+
     return 1;
 }
 



More information about the PVFS2-CVS mailing list