DAFS: avoid saving fileserver state when panicing

[openafs.git] / src / viced / viced.c

diff --git a/src/viced/viced.c b/src/viced/viced.c
index a2c0478..80c3a94 100644 (file)
--- a/src/viced/viced.c
+++ b/src/viced/viced.c
@@ -848,22 +848,27 @@ ShutDownAndCore(int dopanic)
         * demand attach fs
         * save fileserver state to disk */
 
-       /* make sure background threads have finished all of their asynchronous 
-        * work on host and callback structures */
-       FS_STATE_RDLOCK;
-       while (!fs_state.FiveMinuteLWP_tranquil ||
-              !fs_state.HostCheckLWP_tranquil ||
-              !fs_state.FsyncCheckLWP_tranquil) {
-           FS_LOCK;
-           FS_STATE_UNLOCK;
-           ViceLog(0, ("waiting for background host/callback threads to quiesce before saving fileserver state...\n"));
-           assert(pthread_cond_wait(&fs_state.worker_done_cv, &fileproc_glock_mutex) == 0);
-           FS_UNLOCK;
+       if (dopanic) {
+           ViceLog(0, ("Not saving fileserver state; abnormal shutdown\n"));
+
+       } else {
+           /* make sure background threads have finished all of their asynchronous
+            * work on host and callback structures */
            FS_STATE_RDLOCK;
-       }
+           while (!fs_state.FiveMinuteLWP_tranquil ||
+                  !fs_state.HostCheckLWP_tranquil ||
+                  !fs_state.FsyncCheckLWP_tranquil) {
+               FS_LOCK;
+               FS_STATE_UNLOCK;
+               ViceLog(0, ("waiting for background host/callback threads to quiesce before saving fileserver state...\n"));
+               assert(pthread_cond_wait(&fs_state.worker_done_cv, &fileproc_glock_mutex) == 0);
+               FS_UNLOCK;
+               FS_STATE_RDLOCK;
+           }
 
-       /* ok. it should now be fairly safe. let's do the state dump */
-       fs_stateSave();
+           /* ok. it should now be fairly safe. let's do the state dump */
+           fs_stateSave();
+       }
     }
 #endif /* AFS_DEMAND_ATTACH_FS */