Ian Kent 4e72d9a
commit 227ce116a307a7f38967639c94ad74970ee83700
Ian Kent 4e72d9a
Author: zoulasc <christos@zoulas.com>
Ian Kent 4e72d9a
Date:   Tue Mar 8 23:30:38 2016 -0500
Ian Kent 4e72d9a
Ian Kent 4e72d9a
    Improve debugging for unmounting.
Ian Kent 4e72d9a
Ian Kent 4e72d9a
diff --git a/amd/map.c b/amd/map.c
Ian Kent 4e72d9a
index bcb2156..a6df44b 100644
Ian Kent 4e72d9a
--- a/amd/map.c
Ian Kent 4e72d9a
+++ b/amd/map.c
Ian Kent 4e72d9a
@@ -904,10 +904,8 @@ unmount_mp(am_node *mp)
Ian Kent 4e72d9a
   int was_backgrounded = 0;
Ian Kent 4e72d9a
   mntfs *mf = mp->am_al->al_mnt;
Ian Kent 4e72d9a
 
Ian Kent 4e72d9a
-#ifdef notdef
Ian Kent 4e72d9a
   plog(XLOG_INFO, "\"%s\" on %s timed out (flags 0x%x)",
Ian Kent 4e72d9a
-       mp->am_path, mf->mf_mount, (int) mf->mf_flags);
Ian Kent 4e72d9a
-#endif /* notdef */
Ian Kent 4e72d9a
+     mp->am_path, mf->mf_mount, (int) mf->mf_flags);
Ian Kent 4e72d9a
 
Ian Kent 4e72d9a
 #ifndef MNT2_NFS_OPT_SYMTTL
Ian Kent 4e72d9a
     /*
Ian Kent 4e72d9a
@@ -938,11 +936,12 @@ unmount_mp(am_node *mp)
Ian Kent 4e72d9a
       plog(XLOG_STATS, "file server %s is down - timeout of \"%s\" ignored", mf->mf_server->fs_host, mp->am_path);
Ian Kent 4e72d9a
       mf->mf_flags |= MFF_LOGDOWN;
Ian Kent 4e72d9a
     }
Ian Kent 4e72d9a
+    dlog("\"%s\" on %s server is down, deferred", mp->am_path, mf->mf_mount);
Ian Kent 4e72d9a
     notify_child(mp, AMQ_UMNT_SERVER, 0, 0);
Ian Kent 4e72d9a
     return 0;
Ian Kent 4e72d9a
   }
Ian Kent 4e72d9a
 
Ian Kent 4e72d9a
-  dlog("\"%s\" on %s timed out", mp->am_path, mf->mf_mount);
Ian Kent 4e72d9a
+  dlog("\"%s\" on %s timed out, unmounting", mp->am_path, mf->mf_mount);
Ian Kent 4e72d9a
   mf->mf_flags |= MFF_UNMOUNTING;
Ian Kent 4e72d9a
 
Ian Kent 4e72d9a
 #ifdef HAVE_FS_AUTOFS