Whamcloud - gitweb
LU-6906 mgc: IR log failure should not stop mount 28/15728/3
authorwang di <di.wang@intel.com>
Sat, 25 Jul 2015 10:09:36 +0000 (03:09 -0700)
committerOleg Drokin <oleg.drokin@intel.com>
Mon, 3 Aug 2015 02:04:11 +0000 (02:04 +0000)
If clients or other targets can not get IR config lock
or lock, the mount should continue, instead of failing.
Because timeout mechanism will handle the recovery anyway.

Signed-off-by: wang di <di.wang@intel.com>
Change-Id: Ie717cb363180907b510593ee4a6caaec6f07a5f3
Reviewed-on: http://review.whamcloud.com/15728
Tested-by: Jenkins
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Jinshan Xiong <jinshan.xiong@intel.com>
Reviewed-by: James Simmons <uja.ornl@yahoo.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
lustre/mgc/mgc_request.c

index 01be9e2..1b537f6 100644 (file)
@@ -1974,8 +1974,16 @@ restart:
 
         if (cld_is_recover(cld)) {
                 rc = 0; /* this is not a fatal error for recover log */
-                if (rcl == 0)
+                if (rcl == 0) {
                         rc = mgc_process_recover_log(mgc, cld);
+                       if (rc != 0) {
+                               CERROR("%s: recover log %s failed: rc = %d"
+                                      "not fatal.\n", mgc->obd_name,
+                                      cld->cld_logname, rc);
+                               rc = 0;
+                               cld->cld_lostlock = 1;
+                       }
+               }
         } else {
                 rc = mgc_process_cfg_log(mgc, cld, rcl != 0);
         }