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

[CVS commit program]

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

Modified Files:
	sys-remove.sm 
Log Message:
final tweaks to retry behavior in sys-remove: retry removal of objects if,
possible, return success but print warning if we fail.
- the error messages are probably scarier than they need to be for some
  cases, probably should reword or maybe demote some to debug messages?


Index: sys-remove.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/sys-remove.sm,v
diff -p -u -r1.59 -r1.60
--- sys-remove.sm	6 May 2004 20:15:44 -0000	1.59
+++ sys-remove.sm	6 May 2004 20:45:47 -0000	1.60
@@ -719,7 +719,7 @@ static int remove_datafile_remove_setup_
 	/* fill in msgpair structure components */
 	msg_p->fs_id   = sm_p->u.remove.object_ref.fs_id;
 	msg_p->handle  = sm_p->u.remove.datafile_handles[i];
-        msg_p->retry_flag = PVFS_MSGPAIR_NO_RETRY;
+        msg_p->retry_flag = PVFS_MSGPAIR_RETRY;
 	msg_p->comp_fn = NULL;
     }
 
@@ -754,7 +754,7 @@ static int remove_object_remove_setup_ms
     /* 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 = NULL;
 
     ret = PINT_bucket_map_to_server(&sm_p->msgpair.svr_addr,
@@ -833,7 +833,7 @@ static int remove_check_dir_contents_fai
                  "remove state: remove_check_dir_contents_failure\n");
 
     gossip_err("WARNING: PVFS_sys_remove() encountered an error which "
-    "may lead to inconsistent state.\n");
+	"may lead to inconsistent state.\n");
     gossip_err("WARNING: PVFS2 fsck (if available) may be needed.\n");
     js_p->error_code = 0;
     return(1);
@@ -844,6 +844,12 @@ static int remove_datafile_remove_failur
 {
     gossip_debug(GOSSIP_CLIENT_DEBUG,
                  "remove state: datafile_remove_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;
 }
 
@@ -937,7 +943,13 @@ static int remove_object_remove_failure(
 					job_status_s *js_p)
 {
     gossip_debug(GOSSIP_CLIENT_DEBUG,
-                 "remove state: object_remove_failure\n");
+                 "remove state: object_remove_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;
 }