Always check VInitVolumePackage2 return code

Some programs were not checking the return code of VInitVolumePackage2.
Although some programs do not care so much if we fail to properly init
the volume package (SYNC debug tools), at the very least log/print an
error, so it doesn't silently fail.

Other programs are changed to exit when VInitVolumePackage2 fail, so
e.g. salvages don't accidentally cause corruption on 'logging'-mounted
UFS partitions.

In any case, ensure the return code is always checked anywhere it is
called.

Change-Id: I164d5920a5ea2dd7e5ed9ad4ccc578e9bdf0db0b
Reviewed-on: http://gerrit.openafs.org/1090
Tested-by: Andrew Deason <adeason@sinenomine.net>
Reviewed-by: Derrick Brashear <shadow@dementia.org>

diff --git a/src/tsalvaged/salvsync-debug.c b/src/tsalvaged/salvsync-debug.c
index f3775350e41221b334ebed812984bcbe6a3132e2..b802c587864da9634b48d4cf552a54c5cc28c09e 100644 (file)
--- a/src/tsalvaged/salvsync-debug.c
+++ b/src/tsalvaged/salvsync-debug.c
@@ -186,7 +186,13 @@ common_prolog(struct cmd_syndesc * as, struct state * state)
 #endif
 
     VOptDefaults(debugUtility, &opts);
-    VInitVolumePackage2(debugUtility, &opts);
+    if (VInitVolumePackage2(debugUtility, &opts)) {
+       /* VInitVolumePackage2 can fail on e.g. partition attachment errors,
+        * but we don't really care, since all we're doing is trying to use
+        * SALVSYNC */
+       fprintf(stderr, "errors encountered initializing volume package, but "
+                       "trying to continue anyway\n");
+    }
     DInit(1);
 
     if ((ti = as->parms[COMMON_PARMS_OFFSET].items)) { /* -reason */

diff --git a/src/vol/fssync-debug.c b/src/vol/fssync-debug.c
index c746ed0c531c86b9d9ae8e62d51fb7132d2c90f1..a5414d549698ef20f4706c355136f1fb72bfcf8b 100644 (file)
--- a/src/vol/fssync-debug.c
+++ b/src/vol/fssync-debug.c
@@ -232,7 +232,13 @@ common_prolog(struct cmd_syndesc * as, struct state * state)
 #endif
 
     VOptDefaults(debugUtility, &opts);
-    VInitVolumePackage2(debugUtility, &opts);
+    if (VInitVolumePackage2(debugUtility, &opts)) {
+       /* VInitVolumePackage2 can fail on e.g. partition attachment errors,
+        * but we don't really care, since all we're doing is trying to use
+        * FSSYNC */
+       fprintf(stderr, "errors encountered initializing volume package, but "
+                       "trying to continue anyway\n");
+    }
     DInit(1);
 
     if ((ti = as->parms[COMMON_PARMS_OFFSET].items)) { /* -reason */

diff --git a/src/vol/salvaged.c b/src/vol/salvaged.c
index 2dbbc18e01aa8585356328112d3d7f1d3a95d2f7..64680fe579aaef4673d4675703882296eb2d68c7 100644 (file)
--- a/src/vol/salvaged.c
+++ b/src/vol/salvaged.c
@@ -423,7 +423,13 @@ SalvageClient(VolumeId vid, char * pname)
     VolumePackageOptions opts;
 
     VOptDefaults(volumeUtility, &opts);
-    VInitVolumePackage2(volumeUtility, &opts);
+    if (VInitVolumePackage2(volumeUtility, &opts)) {
+       /* VInitVolumePackage2 can fail on e.g. partition attachment errors,
+        * but we don't really care, since all we're doing is trying to use
+        * SALVSYNC */
+       fprintf(stderr, "errors encountered initializing volume package, but "
+                       "trying to continue anyway\n");
+    }
     SALVSYNC_clientInit();
     
     code = SALVSYNC_SalvageVolume(vid, pname, SALVSYNC_SALVAGE, SALVSYNC_OPERATOR, 0, NULL);
@@ -511,7 +517,10 @@ SalvageServer(void)
 
     /* initialize things */
     VOptDefaults(salvageServer, &opts);
-    VInitVolumePackage2(salvageServer, &opts);
+    if (VInitVolumePackage2(salvageServer, &opts)) {
+       Log("Shutting down: errors encountered initializing volume package\n");
+       Exit(1);
+    }
     DInit(10);
     queue_Init(&pending_q);
     queue_Init(&log_cleanup_queue);

diff --git a/src/vol/salvager.c b/src/vol/salvager.c
index 093bbac48c89364b62a2999ccaa2fba7a017bb36..5f305c89027cde821ea488b9b1faa4f452ca7bfe 100644 (file)
--- a/src/vol/salvager.c
+++ b/src/vol/salvager.c
@@ -324,7 +324,10 @@ handleit(struct cmd_syndesc *as, void *arock)
     }
 
     VOptDefaults(pt, &opts);
-    VInitVolumePackage2(pt, &opts);
+    if (VInitVolumePackage2(pt, &opts)) {
+       Log("errors encountered initializing volume package; salvage aborted\n");
+       Exit(1);
+    }
     DInit(10);
 #ifdef AFS_NT40_ENV
     if (myjob.cj_number != NOT_CHILD) {

diff --git a/src/vol/test/testpart.c b/src/vol/test/testpart.c
index 9044c6c59817316fea34b8b71fade6d70bfec087..dc29b80847b0a287ad98d0934aee02a65662ed1f 100644 (file)
--- a/src/vol/test/testpart.c
+++ b/src/vol/test/testpart.c
@@ -41,7 +41,10 @@ main(argc, argv)
     VolumePackageOptions opts;
 
     VOptDefaults(1, &opts);
-    VInitVolumePackage2(1, &opts);
+    if (VInitVolumePackage2(1, &opts)) {
+       printf("errors encountered initializing volume package\n");
+       exit(-1);
+    }
     VPrintDiskStats();
 
 }

diff --git a/src/volser/vol-dump.c b/src/volser/vol-dump.c
index ae743ad2c97623faa7b9e6715788f1ad8a2976d0..c53ad37c96c8c2054f8bd8316626fcbed2ad90bd 100644 (file)
--- a/src/volser/vol-dump.c
+++ b/src/volser/vol-dump.c
@@ -302,7 +302,10 @@ main(int argc, char **argv)
     VolumePackageOptions opts;
 
     VOptDefaults(volumeUtility, &opts);
-    VInitVolumePackage2(volumeUtility, &opts);
+    if (VInitVolumePackage2(volumeUtility, &opts)) {
+       fprintf(stderr, "errors encountered initializing volume package, but "
+                       "trying to continue anyway\n");
+    }
 
     ts = cmd_CreateSyntax(NULL, handleit, NULL,
                          "Dump a volume to a 'vos dump' format file without using volserver");

diff --git a/src/volser/volmain.c b/src/volser/volmain.c
index 46e85412968fe157a6651301ea3b2580b7cdeaf0..f9024f68eda00212085696f737d5645699a1da94 100644 (file)
--- a/src/volser/volmain.c
+++ b/src/volser/volmain.c
@@ -426,7 +426,10 @@ main(int argc, char **argv)
     OpenLog(AFSDIR_SERVER_VOLSERLOG_FILEPATH);
 
     VOptDefaults(volumeServer, &opts);
-    VInitVolumePackage2(volumeServer, &opts);
+    if (VInitVolumePackage2(volumeServer, &opts)) {
+       Log("Shutting down: errors encountered initializing volume package\n");
+       exit(1);
+    }
     /* For nuke() */
     Lock_Init(&localLock);
     DInit(40);