LU-9115 llite: buggy special handling on MULTIMODRPCS

[fs/lustre-release.git] / lustre / ldlm / ldlm_lib.c

diff --git a/lustre/ldlm/ldlm_lib.c b/lustre/ldlm/ldlm_lib.c
index b916701..7ea5b43 100644 (file)
--- a/lustre/ldlm/ldlm_lib.c
+++ b/lustre/ldlm/ldlm_lib.c
@@ -23,7 +23,7 @@
  * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2010, 2015, Intel Corporation.
+ * Copyright (c) 2010, 2016, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -555,7 +555,6 @@ int client_connect_import(const struct lu_env *env,
        struct obd_connect_data *ocd;
        struct lustre_handle    conn    = { 0 };
        int                     rc;
-       bool                    is_mdc = false;
        ENTRY;
 
        *exp = NULL;
@@ -580,18 +579,12 @@ int client_connect_import(const struct lu_env *env,
        ocd = &imp->imp_connect_data;
        if (data) {
                *ocd = *data;
-               is_mdc = strncmp(imp->imp_obd->obd_type->typ_name,
-                                LUSTRE_MDC_NAME, 3) == 0;
-               if (is_mdc)
-                       data->ocd_connect_flags |= OBD_CONNECT_MULTIMODRPCS;
                imp->imp_connect_flags_orig = data->ocd_connect_flags;
                imp->imp_connect_flags2_orig = data->ocd_connect_flags2;
        }
 
        rc = ptlrpc_connect_import(imp);
        if (rc != 0) {
-               if (data && is_mdc)
-                       data->ocd_connect_flags &= ~OBD_CONNECT_MULTIMODRPCS;
                LASSERT(imp->imp_state == LUSTRE_IMP_DISCON);
                GOTO(out_ldlm, rc);
        }
@@ -602,10 +595,6 @@ int client_connect_import(const struct lu_env *env,
                         ocd->ocd_connect_flags, "old %#llx, new %#llx\n",
                         data->ocd_connect_flags, ocd->ocd_connect_flags);
                data->ocd_connect_flags = ocd->ocd_connect_flags;
-               /* clear the flag as it was not set and is not known
-                * by upper layers */
-               if (is_mdc)
-                       data->ocd_connect_flags &= ~OBD_CONNECT_MULTIMODRPCS;
        }
 
        ptlrpc_pinger_add_import(imp);
@@ -785,7 +774,7 @@ static int target_handle_reconnect(struct lustre_handle *conn,
        }
 
        now = cfs_time_current();
-       deadline = cfs_timer_deadline(&target->obd_recovery_timer);
+       deadline = target->obd_recovery_timer.expires;
        if (cfs_time_before(now, deadline)) {
                struct target_distribute_txn_data *tdtd =
                                        class_exp2tgt(exp)->lut_tdtd;
@@ -834,20 +823,6 @@ out_already:
        RETURN(EALREADY);
 }
 
-void target_client_add_cb(struct obd_device *obd, __u64 transno, void *cb_data,
-                          int error)
-{
-        struct obd_export *exp = cb_data;
-
-        CDEBUG(D_RPCTRACE, "%s: committing for initial connect of %s\n",
-               obd->obd_name, exp->exp_client_uuid.uuid);
-
-       spin_lock(&exp->exp_lock);
-       exp->exp_need_sync = 0;
-       spin_unlock(&exp->exp_lock);
-       class_export_cb_put(exp);
-}
-
 static void
 check_and_start_recovery_timer(struct obd_device *obd,
                                struct ptlrpc_request *req, int new_client);
@@ -1290,7 +1265,7 @@ no_export:
                        i = atomic_read(&target->obd_lock_replay_clients);
                        k = target->obd_max_recoverable_clients;
                        s = target->obd_stale_clients;
-                       t = cfs_timer_deadline(&target->obd_recovery_timer);
+                       t = target->obd_recovery_timer.expires;
                        t = cfs_time_sub(t, cfs_time_current());
                        t = cfs_duration_sec(t);
                        LCONSOLE_WARN("%s: Denying connection for new client %s"
@@ -1727,7 +1702,7 @@ EXPORT_SYMBOL(target_cleanup_recovery);
 void target_cancel_recovery_timer(struct obd_device *obd)
 {
         CDEBUG(D_HA, "%s: cancel recovery timer\n", obd->obd_name);
-        cfs_timer_disarm(&obd->obd_recovery_timer);
+       del_timer(&obd->obd_recovery_timer);
 }
 
 static void target_start_recovery_timer(struct obd_device *obd)
@@ -1748,8 +1723,8 @@ static void target_start_recovery_timer(struct obd_device *obd)
                return;
        }
 
-       cfs_timer_arm(&obd->obd_recovery_timer,
-                     cfs_time_shift(obd->obd_recovery_timeout));
+       mod_timer(&obd->obd_recovery_timer,
+                 cfs_time_shift(obd->obd_recovery_timeout));
        obd->obd_recovery_start = cfs_time_current_sec();
        spin_unlock(&obd->obd_dev_lock);
 
@@ -1794,13 +1769,18 @@ static void extend_recovery_timer(struct obd_device *obd, int drt, bool extend)
                 to = drt;
         }
 
-        if (to > obd->obd_recovery_time_hard)
-                to = obd->obd_recovery_time_hard;
+       if (to > obd->obd_recovery_time_hard) {
+               to = obd->obd_recovery_time_hard;
+               CWARN("%s: extended recovery timer reaching hard "
+                     "limit: %d, extend: %d\n",
+                     obd->obd_name, to, extend);
+       }
+
        if (obd->obd_recovery_timeout < to) {
                 obd->obd_recovery_timeout = to;
                end = obd->obd_recovery_start + to;
-               cfs_timer_arm(&obd->obd_recovery_timer,
-                               cfs_time_shift(end - now));
+               mod_timer(&obd->obd_recovery_timer,
+                         cfs_time_shift(end - now));
         }
        spin_unlock(&obd->obd_dev_lock);
 
@@ -1839,6 +1819,10 @@ check_and_start_recovery_timer(struct obd_device *obd,
         * and reuse service_time to limit stack usage. */
        service_time = at_est2timeout(service_time);
 
+       if (OBD_FAIL_CHECK(OBD_FAIL_TGT_SLUGGISH_NET) &&
+           service_time < at_extra)
+               service_time = at_extra;
+
        /* We expect other clients to timeout within service_time, then try
         * to reconnect, then try the failover server.  The max delay between
         * connect attempts is SWITCH_MAX + SWITCH_INC + INITIAL. */
@@ -2661,8 +2645,9 @@ void target_recovery_init(struct lu_target *lut, svc_handler_t handler)
         obd->obd_recovery_start = 0;
         obd->obd_recovery_end = 0;
 
-        cfs_timer_init(&obd->obd_recovery_timer, target_recovery_expired, obd);
-        target_start_recovery_thread(lut, handler);
+       setup_timer(&obd->obd_recovery_timer, target_recovery_expired,
+                   (unsigned long)obd);
+       target_start_recovery_thread(lut, handler);
 }
 EXPORT_SYMBOL(target_recovery_init);