ORNL-28: Set recovery timeout correctly

[fs/lustre-release.git] / lustre / obdclass / obd_mount.c

diff --git a/lustre/obdclass/obd_mount.c b/lustre/obdclass/obd_mount.c
index 4a8b91f..6e18246 100644 (file)
--- a/lustre/obdclass/obd_mount.c
+++ b/lustre/obdclass/obd_mount.c
@@ -1295,11 +1295,11 @@ out_mgc:
 
                 server_notify_target(sb, obd);
 
-                /* log has been fully processed */
-                obd_notify(obd, NULL, OBD_NOTIFY_CONFIG, (void *)CONFIG_LOG);
-
                 /* calculate recovery timeout, do it after lustre_process_log */
                 server_calc_timeout(lsi, obd);
+
+                /* log has been fully processed */
+                obd_notify(obd, NULL, OBD_NOTIFY_CONFIG, (void *)CONFIG_LOG);
         }
 
         RETURN(rc);
@@ -1916,7 +1916,7 @@ void server_calc_timeout(struct lustre_sb_info *lsi, struct obd_device *obd)
         }
 
         /* we're done */
-        obd->obd_recovery_timeout   = soft;
+        obd->obd_recovery_timeout   = max(obd->obd_recovery_timeout, soft);
         obd->obd_recovery_time_hard = hard;
         obd->obd_recovery_ir_factor = factor;
 }