LU-5420 ptlrpc: revert ptlrpc_reconnect_import() changes

Revert the changes from LU-4913 in ptlrpc_reconnect_import()
(commit cae32fb38f0754ab2f8eae89ffe9151c6c194ef8) that are
causing intermittent MDS startup problems due to an inability
to reconnect to MGS if it is sharing the same OSD.  The MGS
connection has historically been pretty different from other
kinds of ptlrpc connections.

Work in LU-5420 will continue to better unify these different
connection options meanwhile, so this is not really a final fix,
just merely a way to bring things back into stable state in time
for 2.7.0 release.

Change-Id: I72aa43332dade8f3fc67a028cd4685f9f4383953
Signed-off-by: Oleg Drokin <oleg.drokin@intel.com>
Reviewed-on: http://review.whamcloud.com/13838
Tested-by: Jenkins
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: wangdi <di.wang@intel.com>

diff --git a/lustre/ptlrpc/import.c b/lustre/ptlrpc/import.c
index 5d1e6b8..d046a2d 100644 (file)
--- a/lustre/ptlrpc/import.c
+++ b/lustre/ptlrpc/import.c
@@ -441,23 +441,6 @@ void ptlrpc_fail_import(struct obd_import *imp, __u32 conn_cnt)
 
 int ptlrpc_reconnect_import(struct obd_import *imp)
 {
-#ifdef ENABLE_PINGER
-       struct l_wait_info lwi;
-       int secs = cfs_time_seconds(obd_timeout);
-       int rc;
-
-       ptlrpc_pinger_force(imp);
-
-       CDEBUG(D_HA, "%s: recovery started, waiting %u seconds\n",
-              obd2cli_tgt(imp->imp_obd), secs);
-
-       lwi = LWI_TIMEOUT(secs, NULL, NULL);
-       rc = l_wait_event(imp->imp_recovery_waitq,
-                         !ptlrpc_import_in_recovery(imp), &lwi);
-       CDEBUG(D_HA, "%s: recovery finished s:%s\n", obd2cli_tgt(imp->imp_obd),
-              ptlrpc_import_state_name(imp->imp_state));
-       return rc;
-#else
        ptlrpc_set_import_discon(imp, 0);
        /* Force a new connect attempt */
        ptlrpc_invalidate_import(imp);
@@ -483,7 +466,6 @@ int ptlrpc_reconnect_import(struct obd_import *imp)
        /* Attempt a new connect */
        ptlrpc_recover_import(imp, NULL, 0);
        return 0;
-#endif
 }
 EXPORT_SYMBOL(ptlrpc_reconnect_import);
 

diff --git a/lustre/tests/conf-sanity.sh b/lustre/tests/conf-sanity.sh
index 3043cf5..6174991 100644 (file)
--- a/lustre/tests/conf-sanity.sh
+++ b/lustre/tests/conf-sanity.sh
@@ -4,8 +4,8 @@ set -e
 
 ONLY=${ONLY:-"$*"}
 
-# bug number for skipped test:     LU-2828
-ALWAYS_EXCEPT="$CONF_SANITY_EXCEPT 59 64"
+# bug number for skipped test:     LU-2828 LU-5420
+ALWAYS_EXCEPT="$CONF_SANITY_EXCEPT 59 64    80"
 # UPDATE THE COMMENT ABOVE WITH BUG NUMBERS WHEN CHANGING ALWAYS_EXCEPT!
 
 is_sles11()                                            # LU-2181