/**
* Updates import \a imp current state to provided \a state value
- * Helper function. Must be called under imp_lock.
+ * Helper function.
*/
-static void __import_set_state(struct obd_import *imp,
- enum lustre_imp_state state)
+static void import_set_state_nolock(struct obd_import *imp,
+ enum lustre_imp_state state)
{
switch (state) {
case LUSTRE_IMP_CLOSED:
break;
default:
imp->imp_replay_state = LUSTRE_IMP_REPLAY;
+ break;
}
+
+ /* A CLOSED import should remain so. */
+ if (state == LUSTRE_IMP_CLOSED)
+ return;
+
+ if (imp->imp_state != LUSTRE_IMP_NEW) {
+ CDEBUG(D_HA, "%p %s: changing import state from %s to %s\n",
+ imp, obd2cli_tgt(imp->imp_obd),
+ ptlrpc_import_state_name(imp->imp_state),
+ ptlrpc_import_state_name(state));
+ }
+
imp->imp_state = state;
imp->imp_state_hist[imp->imp_state_hist_idx].ish_state = state;
imp->imp_state_hist[imp->imp_state_hist_idx].ish_time =
IMP_STATE_HIST_LEN;
}
-/* A CLOSED import should remain so. */
-#define IMPORT_SET_STATE_NOLOCK(imp, state) \
-do { \
- if (imp->imp_state != LUSTRE_IMP_CLOSED) { \
- CDEBUG(D_HA, "%p %s: changing import state from %s to %s\n", \
- imp, obd2cli_tgt(imp->imp_obd), \
- ptlrpc_import_state_name(imp->imp_state), \
- ptlrpc_import_state_name(state)); \
- __import_set_state(imp, state); \
- } \
-} while(0)
-
-#define IMPORT_SET_STATE(imp, state) \
-do { \
- spin_lock(&imp->imp_lock); \
- IMPORT_SET_STATE_NOLOCK(imp, state); \
- spin_unlock(&imp->imp_lock); \
-} while(0)
+static void import_set_state(struct obd_import *imp,
+ enum lustre_imp_state new_state)
+{
+ spin_lock(&imp->imp_lock);
+ import_set_state_nolock(imp, new_state);
+ spin_unlock(&imp->imp_lock);
+}
void ptlrpc_import_enter_resend(struct obd_import *imp)
{
- IMPORT_SET_STATE(imp, LUSTRE_IMP_RECOVER);
+ import_set_state(imp, LUSTRE_IMP_RECOVER);
}
EXPORT_SYMBOL(ptlrpc_import_enter_resend);
*uuid_len -= strlen(UUID_STR);
}
+/* Must be called with imp_lock held! */
+static void ptlrpc_deactivate_import_nolock(struct obd_import *imp)
+{
+ ENTRY;
+
+ assert_spin_locked(&imp->imp_lock);
+ CDEBUG(D_HA, "setting import %s INVALID\n", obd2cli_tgt(imp->imp_obd));
+ imp->imp_invalid = 1;
+ imp->imp_generation++;
+
+ ptlrpc_abort_inflight(imp);
+
+ EXIT;
+}
+
/**
* Returns true if import was FULL, false if import was already not
* connected.
* bulk requests) and if one has already caused a reconnection
* (increasing the import->conn_cnt) the older failure should
* not also cause a reconnection. If zero it forces a reconnect.
+ * @invalid - set import invalid flag
*/
-int ptlrpc_set_import_discon(struct obd_import *imp, __u32 conn_cnt)
+int ptlrpc_set_import_discon(struct obd_import *imp,
+ __u32 conn_cnt, bool invalid)
{
int rc = 0;
(conn_cnt == 0 || conn_cnt == imp->imp_conn_cnt)) {
char *target_start;
int target_len;
+ bool inact = false;
deuuidify(obd2cli_tgt(imp->imp_obd), NULL,
&target_start, &target_len);
+ import_set_state_nolock(imp, LUSTRE_IMP_DISCON);
if (imp->imp_replayable) {
LCONSOLE_WARN("%s: Connection to %.*s (at %s) was "
"lost; in progress operations using this "
"operations using this service will fail\n",
imp->imp_obd->obd_name, target_len, target_start,
obd_import_nid2str(imp));
+ if (invalid) {
+ CDEBUG(D_HA, "import %s@%s for %s not "
+ "replayable, auto-deactivating\n",
+ obd2cli_tgt(imp->imp_obd),
+ imp->imp_connection->c_remote_uuid.uuid,
+ imp->imp_obd->obd_name);
+ ptlrpc_deactivate_import_nolock(imp);
+ inact = true;
+ }
}
- IMPORT_SET_STATE_NOLOCK(imp, LUSTRE_IMP_DISCON);
spin_unlock(&imp->imp_lock);
if (obd_dump_on_timeout)
libcfs_debug_dumplog();
obd_import_event(imp->imp_obd, imp, IMP_EVENT_DISCON);
+
+ if (inact)
+ obd_import_event(imp->imp_obd, imp, IMP_EVENT_INACTIVE);
rc = 1;
} else {
spin_unlock(&imp->imp_lock);
return rc;
}
-/* Must be called with imp_lock held! */
-static void ptlrpc_deactivate_and_unlock_import(struct obd_import *imp)
-{
- ENTRY;
- assert_spin_locked(&imp->imp_lock);
-
- CDEBUG(D_HA, "setting import %s INVALID\n", obd2cli_tgt(imp->imp_obd));
- imp->imp_invalid = 1;
- imp->imp_generation++;
- spin_unlock(&imp->imp_lock);
-
- ptlrpc_abort_inflight(imp);
- obd_import_event(imp->imp_obd, imp, IMP_EVENT_INACTIVE);
-
- EXIT;
-}
-
/*
* This acts as a barrier; all existing requests are rejected, and
* no new requests will be accepted until the import is valid again.
void ptlrpc_deactivate_import(struct obd_import *imp)
{
spin_lock(&imp->imp_lock);
- ptlrpc_deactivate_and_unlock_import(imp);
+ ptlrpc_deactivate_import_nolock(imp);
+ spin_unlock(&imp->imp_lock);
+
+ obd_import_event(imp->imp_obd, imp, IMP_EVENT_INACTIVE);
}
EXPORT_SYMBOL(ptlrpc_deactivate_import);
}
CERROR("%s: Unregistering RPCs found (%d). "
- "Network is sluggish? Waiting them "
+ "Network is sluggish? Waiting for them "
"to error out.\n", cli_tgt,
atomic_read(&imp->imp_unregistering));
}
EXPORT_SYMBOL(ptlrpc_invalidate_import);
/* unset imp_invalid */
-void ptlrpc_activate_import(struct obd_import *imp)
+void ptlrpc_activate_import(struct obd_import *imp, bool set_state_full)
{
struct obd_device *obd = imp->imp_obd;
spin_lock(&imp->imp_lock);
if (imp->imp_deactive != 0) {
+ LASSERT(imp->imp_state != LUSTRE_IMP_FULL);
+ if (imp->imp_state != LUSTRE_IMP_DISCON)
+ import_set_state_nolock(imp, LUSTRE_IMP_DISCON);
spin_unlock(&imp->imp_lock);
return;
}
+ if (set_state_full)
+ import_set_state_nolock(imp, LUSTRE_IMP_FULL);
imp->imp_invalid = 0;
+
spin_unlock(&imp->imp_lock);
obd_import_event(obd, imp, IMP_EVENT_ACTIVE);
}
void ptlrpc_fail_import(struct obd_import *imp, __u32 conn_cnt)
{
- ENTRY;
-
- LASSERT(!imp->imp_dlm_fake);
+ ENTRY;
- if (ptlrpc_set_import_discon(imp, conn_cnt)) {
- if (!imp->imp_replayable) {
- CDEBUG(D_HA, "import %s@%s for %s not replayable, "
- "auto-deactivating\n",
- obd2cli_tgt(imp->imp_obd),
- imp->imp_connection->c_remote_uuid.uuid,
- imp->imp_obd->obd_name);
- ptlrpc_deactivate_import(imp);
- }
+ LASSERT(!imp->imp_dlm_fake);
+ if (ptlrpc_set_import_discon(imp, conn_cnt, true))
ptlrpc_pinger_force(imp);
- }
+
EXIT;
}
ptlrpc_import_state_name(imp->imp_state));
return rc;
#else
- ptlrpc_set_import_discon(imp, 0);
+ ptlrpc_set_import_discon(imp, 0, false);
/* Force a new connect attempt */
ptlrpc_invalidate_import(imp);
/* Do a fresh connect next time by zeroing the handle */
/* Allow reconnect attempts */
imp->imp_obd->obd_no_recov = 0;
/* Remove 'invalid' flag */
- ptlrpc_activate_import(imp);
+ ptlrpc_activate_import(imp, false);
/* Attempt a new connect */
ptlrpc_recover_import(imp, NULL, 0);
return 0;
imp->imp_conn_current = imp_conn;
}
+ /* The below message is checked in conf-sanity.sh test_35[ab] */
CDEBUG(D_HA, "%s: import %p using connection %s/%s\n",
imp->imp_obd->obd_name, imp, imp_conn->oic_uuid.uuid,
libcfs_nid2str(imp_conn->oic_conn->c_peer.nid));
req = list_entry(tmp, struct ptlrpc_request, rq_replay_list);
*transno = req->rq_transno;
if (req->rq_transno == 0) {
- DEBUG_REQ(D_ERROR, req, "zero transno in committed_list");
+ DEBUG_REQ(D_ERROR, req,
+ "zero transno in committed_list");
LBUG();
}
return 1;
return 0;
}
+int ptlrpc_connect_import(struct obd_import *imp)
+{
+ spin_lock(&imp->imp_lock);
+ return ptlrpc_connect_import_locked(imp);
+}
+
/**
* Attempt to (re)connect import \a imp. This includes all preparations,
* initializing CONNECT RPC request and passing it to ptlrpcd for
* actual sending.
+ *
+ * Assumes imp->imp_lock is held, and releases it.
+ *
* Returns 0 on success or error code.
*/
-int ptlrpc_connect_import(struct obd_import *imp)
+int ptlrpc_connect_import_locked(struct obd_import *imp)
{
struct obd_device *obd = imp->imp_obd;
int initial_connect = 0;
int set_transno = 0;
__u64 committed_before_reconnect = 0;
struct ptlrpc_request *request;
+ struct obd_connect_data ocd;
char *bufs[] = { NULL,
obd2cli_tgt(imp->imp_obd),
obd->obd_uuid.uuid,
(char *)&imp->imp_dlm_handle,
- (char *)&imp->imp_connect_data,
+ (char *)&ocd,
NULL };
struct ptlrpc_connect_async_args *aa;
int rc;
ENTRY;
- spin_lock(&imp->imp_lock);
+ assert_spin_locked(&imp->imp_lock);
+
if (imp->imp_state == LUSTRE_IMP_CLOSED) {
spin_unlock(&imp->imp_lock);
CERROR("can't connect to a closed import\n");
RETURN(-EALREADY);
}
- IMPORT_SET_STATE_NOLOCK(imp, LUSTRE_IMP_CONNECTING);
+ import_set_state_nolock(imp, LUSTRE_IMP_CONNECTING);
imp->imp_conn_cnt++;
imp->imp_resend_replay = 0;
/* Reset connect flags to the originally requested flags, in case
* the server is updated on-the-fly we will get the new features. */
- imp->imp_connect_data.ocd_connect_flags = imp->imp_connect_flags_orig;
- imp->imp_connect_data.ocd_connect_flags2 = imp->imp_connect_flags2_orig;
+ ocd = imp->imp_connect_data;
+ ocd.ocd_connect_flags = imp->imp_connect_flags_orig;
+ ocd.ocd_connect_flags2 = imp->imp_connect_flags2_orig;
/* Reset ocd_version each time so the server knows the exact versions */
- imp->imp_connect_data.ocd_version = LUSTRE_VERSION_CODE;
+ ocd.ocd_version = LUSTRE_VERSION_CODE;
imp->imp_msghdr_flags &= ~MSGHDR_AT_SUPPORT;
imp->imp_msghdr_flags &= ~MSGHDR_CKSUM_INCOMPAT18;
rc = obd_reconnect(NULL, imp->imp_obd->obd_self_export, obd,
- &obd->obd_uuid, &imp->imp_connect_data, NULL);
+ &obd->obd_uuid, &ocd, NULL);
if (rc)
GOTO(out, rc);
ptlrpc_request_set_replen(request);
request->rq_interpret_reply = ptlrpc_connect_interpret;
- CLASSERT(sizeof(*aa) <= sizeof(request->rq_async_args));
- aa = ptlrpc_req_async_args(request);
+ aa = ptlrpc_req_async_args(aa, request);
memset(aa, 0, sizeof *aa);
aa->pcaa_peer_committed = committed_before_reconnect;
rc = 0;
out:
if (rc != 0)
- IMPORT_SET_STATE(imp, LUSTRE_IMP_DISCON);
+ import_set_state(imp, LUSTRE_IMP_DISCON);
RETURN(rc);
}
struct client_obd *cli = &imp->imp_obd->u.cli;
spin_lock(&imp->imp_lock);
- list_del(&imp->imp_conn_current->oic_item);
- list_add(&imp->imp_conn_current->oic_item,
- &imp->imp_conn_list);
+ list_move(&imp->imp_conn_current->oic_item,
+ &imp->imp_conn_list);
imp->imp_last_success_conn =
imp->imp_conn_current->oic_last_attempt;
cli->cl_supp_cksum_types = OBD_CKSUM_ADLER;
}
cli->cl_cksum_type = obd_cksum_type_select(imp->imp_obd->obd_name,
- cli->cl_supp_cksum_types);
+ cli->cl_supp_cksum_types,
+ cli->cl_preferred_cksum_type);
if (ocd->ocd_connect_flags & OBD_CONNECT_BRW_SIZE)
cli->cl_max_pages_per_rpc =
* this leads to losing user settings done before such as
* disable lru_resize, etc. */
if (old_connect_flags != exp_connect_flags(exp) || init_connect) {
+ struct ldlm_namespace *ns = imp->imp_obd->obd_namespace;
+ __u64 changed_flags;
+
+ changed_flags =
+ ns->ns_connect_flags ^ ns->ns_orig_connect_flags;
CDEBUG(D_HA, "%s: Resetting ns_connect_flags to server "
"flags: %#llx\n", imp->imp_obd->obd_name,
ocd->ocd_connect_flags);
- imp->imp_obd->obd_namespace->ns_connect_flags =
- ocd->ocd_connect_flags;
- imp->imp_obd->obd_namespace->ns_orig_connect_flags =
- ocd->ocd_connect_flags;
+ ns->ns_connect_flags = (ns->ns_connect_flags & changed_flags) |
+ (ocd->ocd_connect_flags & ~changed_flags);
+ ns->ns_orig_connect_flags = ocd->ocd_connect_flags;
}
if (ocd->ocd_connect_flags & OBD_CONNECT_AT)
RETURN(0);
}
+ imp->imp_connect_error = rc;
if (rc) {
struct ptlrpc_request *free_req;
struct ptlrpc_request *tmp;
spin_lock(&imp->imp_lock);
if (msg_flags & MSG_CONNECT_REPLAYABLE) {
imp->imp_replayable = 1;
- spin_unlock(&imp->imp_lock);
CDEBUG(D_HA, "connected to replayable target: %s\n",
obd2cli_tgt(imp->imp_obd));
} else {
imp->imp_replayable = 0;
- spin_unlock(&imp->imp_lock);
}
/* if applies, adjust the imp->imp_msg_magic here
if (msg_flags & MSG_CONNECT_RECOVERING) {
CDEBUG(D_HA, "connect to %s during recovery\n",
obd2cli_tgt(imp->imp_obd));
- IMPORT_SET_STATE(imp, LUSTRE_IMP_REPLAY_LOCKS);
+ import_set_state_nolock(imp, LUSTRE_IMP_REPLAY_LOCKS);
+ spin_unlock(&imp->imp_lock);
} else {
- IMPORT_SET_STATE(imp, LUSTRE_IMP_FULL);
- ptlrpc_activate_import(imp);
+ spin_unlock(&imp->imp_lock);
+ ptlrpc_activate_import(imp, true);
}
GOTO(finish, rc = 0);
*lustre_msg_get_handle(request->rq_repmsg);
if (!(MSG_CONNECT_RECOVERING & msg_flags)) {
- IMPORT_SET_STATE(imp, LUSTRE_IMP_EVICTED);
+ import_set_state(imp, LUSTRE_IMP_EVICTED);
GOTO(finish, rc = 0);
}
if (imp->imp_invalid) {
CDEBUG(D_HA, "%s: reconnected but import is invalid; "
"marking evicted\n", imp->imp_obd->obd_name);
- IMPORT_SET_STATE(imp, LUSTRE_IMP_EVICTED);
+ import_set_state(imp, LUSTRE_IMP_EVICTED);
} else if (MSG_CONNECT_RECOVERING & msg_flags) {
CDEBUG(D_HA, "%s: reconnected to %s during replay\n",
imp->imp_obd->obd_name,
imp->imp_resend_replay = 1;
spin_unlock(&imp->imp_lock);
- IMPORT_SET_STATE(imp, imp->imp_replay_state);
+ import_set_state(imp, imp->imp_replay_state);
} else {
- IMPORT_SET_STATE(imp, LUSTRE_IMP_RECOVER);
+ import_set_state(imp, LUSTRE_IMP_RECOVER);
}
} else if ((MSG_CONNECT_RECOVERING & msg_flags) && !imp->imp_invalid) {
LASSERT(imp->imp_replayable);
*lustre_msg_get_handle(request->rq_repmsg);
imp->imp_last_replay_transno = 0;
imp->imp_replay_cursor = &imp->imp_committed_list;
- IMPORT_SET_STATE(imp, LUSTRE_IMP_REPLAY);
+ import_set_state(imp, LUSTRE_IMP_REPLAY);
} else if ((ocd->ocd_connect_flags & OBD_CONNECT_LIGHTWEIGHT) != 0 &&
!imp->imp_invalid) {
obd_import_event(imp->imp_obd, imp, IMP_EVENT_INVALIDATE);
+ /* The below message is checked in recovery-small.sh test_106 */
DEBUG_REQ(D_HA, request, "%s: lwp recover",
imp->imp_obd->obd_name);
imp->imp_remote_handle =
*lustre_msg_get_handle(request->rq_repmsg);
- IMPORT_SET_STATE(imp, LUSTRE_IMP_RECOVER);
+ import_set_state(imp, LUSTRE_IMP_RECOVER);
} else {
- DEBUG_REQ(D_HA, request, "%s: evicting (reconnect/recover flags"
- " not set: %x)", imp->imp_obd->obd_name, msg_flags);
- imp->imp_remote_handle =
- *lustre_msg_get_handle(request->rq_repmsg);
- IMPORT_SET_STATE(imp, LUSTRE_IMP_EVICTED);
- }
+ DEBUG_REQ(D_HA, request,
+ "%s: evicting (reconnect/recover flags not set: %x)",
+ imp->imp_obd->obd_name, msg_flags);
+ imp->imp_remote_handle =
+ *lustre_msg_get_handle(request->rq_repmsg);
+ import_set_state(imp, LUSTRE_IMP_EVICTED);
+ }
- /* Sanity checks for a reconnected import. */
- if (!(imp->imp_replayable) != !(msg_flags & MSG_CONNECT_REPLAYABLE)) {
- CERROR("imp_replayable flag does not match server "
- "after reconnect. We should LBUG right here.\n");
- }
+ /* Sanity checks for a reconnected import. */
+ if (!(imp->imp_replayable) != !(msg_flags & MSG_CONNECT_REPLAYABLE))
+ CERROR("imp_replayable flag does not match server after reconnect. We should LBUG right here.\n");
+
+ if (lustre_msg_get_last_committed(request->rq_repmsg) > 0 &&
+ lustre_msg_get_last_committed(request->rq_repmsg) <
+ aa->pcaa_peer_committed) {
+ static bool printed;
- if (lustre_msg_get_last_committed(request->rq_repmsg) > 0 &&
- lustre_msg_get_last_committed(request->rq_repmsg) <
- aa->pcaa_peer_committed) {
- CERROR("%s went back in time (transno %lld"
- " was previously committed, server now claims %lld"
- ")! See https://bugzilla.lustre.org/show_bug.cgi?"
- "id=9646\n",
+ /* The below message is checked in recovery-small.sh test_54 */
+ CERROR("%s: went back in time (transno %lld was previously committed, server now claims %lld)!\n",
obd2cli_tgt(imp->imp_obd), aa->pcaa_peer_committed,
lustre_msg_get_last_committed(request->rq_repmsg));
+ if (!printed) {
+ CERROR("For further information, see http://doc.lustre.org/lustre_manual.xhtml#went_back_in_time\n");
+ printed = true;
+ }
}
finish:
}
out:
- spin_lock(&imp->imp_lock);
- imp->imp_connected = 0;
- imp->imp_connect_tried = 1;
- spin_unlock(&imp->imp_lock);
-
if (exp != NULL)
class_export_put(exp);
- if (rc != 0) {
- IMPORT_SET_STATE(imp, LUSTRE_IMP_DISCON);
- if (rc == -EACCES) {
- /*
- * Give up trying to reconnect
- * EACCES means client has no permission for connection
- */
- imp->imp_obd->obd_no_recov = 1;
- ptlrpc_deactivate_import(imp);
- }
-
- if (rc == -EPROTO) {
- struct obd_connect_data *ocd;
+ spin_lock(&imp->imp_lock);
+ imp->imp_connected = 0;
+ imp->imp_connect_tried = 1;
- /* reply message might not be ready */
- if (request->rq_repmsg == NULL)
- RETURN(-EPROTO);
+ if (rc != 0) {
+ bool inact = false;
+
+ import_set_state_nolock(imp, LUSTRE_IMP_DISCON);
+ if (rc == -EACCES) {
+ /*
+ * Give up trying to reconnect
+ * EACCES means client has no permission for connection
+ */
+ imp->imp_obd->obd_no_recov = 1;
+ ptlrpc_deactivate_import_nolock(imp);
+ inact = true;
+ } else if (rc == -EPROTO) {
+ struct obd_connect_data *ocd;
+
+ /* reply message might not be ready */
+ if (request->rq_repmsg == NULL) {
+ spin_unlock(&imp->imp_lock);
+ RETURN(-EPROTO);
+ }
ocd = req_capsule_server_get(&request->rq_pill,
&RMF_CONNECT_DATA);
OBD_OCD_VERSION_PATCH(ocd->ocd_version),
OBD_OCD_VERSION_FIX(ocd->ocd_version),
LUSTRE_VERSION_STRING);
- ptlrpc_deactivate_import(imp);
- IMPORT_SET_STATE(imp, LUSTRE_IMP_CLOSED);
- }
- RETURN(-EPROTO);
- }
+ ptlrpc_deactivate_import_nolock(imp);
+ import_set_state_nolock(imp, LUSTRE_IMP_CLOSED);
+ inact = true;
+ }
+ }
+ spin_unlock(&imp->imp_lock);
+
+ if (inact)
+ obd_import_event(imp->imp_obd, imp, IMP_EVENT_INACTIVE);
+
+ if (rc == -EPROTO)
+ RETURN(rc);
ptlrpc_maybe_ping_import_soon(imp);
CDEBUG(D_HA, "recovery of %s on %s failed (%d)\n",
obd2cli_tgt(imp->imp_obd),
(char *)imp->imp_connection->c_remote_uuid.uuid, rc);
+ } else {
+ spin_unlock(&imp->imp_lock);
}
wake_up_all(&imp->imp_recovery_waitq);
libcfs_debug_dumplog();
}
- IMPORT_SET_STATE(imp, LUSTRE_IMP_RECOVER);
+ import_set_state(imp, LUSTRE_IMP_RECOVER);
ptlrpc_import_recovery_state_machine(imp);
class_import_put(imp);
rc = ptlrpc_replay_next(imp, &inflight);
if (inflight == 0 &&
atomic_read(&imp->imp_replay_inflight) == 0) {
- IMPORT_SET_STATE(imp, LUSTRE_IMP_REPLAY_LOCKS);
+ import_set_state(imp, LUSTRE_IMP_REPLAY_LOCKS);
rc = ldlm_replay_locks(imp);
if (rc)
GOTO(out, rc);
if (imp->imp_state == LUSTRE_IMP_REPLAY_LOCKS) {
if (atomic_read(&imp->imp_replay_inflight) == 0) {
- IMPORT_SET_STATE(imp, LUSTRE_IMP_REPLAY_WAIT);
+ import_set_state(imp, LUSTRE_IMP_REPLAY_WAIT);
rc = signal_completed_replay(imp);
if (rc)
GOTO(out, rc);
if (imp->imp_state == LUSTRE_IMP_REPLAY_WAIT) {
if (atomic_read(&imp->imp_replay_inflight) == 0) {
- IMPORT_SET_STATE(imp, LUSTRE_IMP_RECOVER);
+ import_set_state(imp, LUSTRE_IMP_RECOVER);
}
}
- if (imp->imp_state == LUSTRE_IMP_RECOVER) {
+ if (imp->imp_state == LUSTRE_IMP_RECOVER) {
struct ptlrpc_connection *conn = imp->imp_connection;
- rc = ptlrpc_resend(imp);
- if (rc)
- GOTO(out, rc);
- IMPORT_SET_STATE(imp, LUSTRE_IMP_FULL);
- ptlrpc_activate_import(imp);
+ rc = ptlrpc_resend(imp);
+ if (rc)
+ GOTO(out, rc);
+ ptlrpc_activate_import(imp, true);
LCONSOLE_INFO("%s: Connection restored to %s (at %s)\n",
imp->imp_obd->obd_name,
obd_uuid2str(&conn->c_remote_uuid),
obd_import_nid2str(imp));
- }
+ }
if (imp->imp_state == LUSTRE_IMP_FULL) {
wake_up_all(&imp->imp_recovery_waitq);
req = ptlrpc_request_alloc_pack(imp, &RQF_MDS_DISCONNECT,
LUSTRE_OBD_VERSION, rq_opc);
if (req == NULL)
- RETURN(NULL);
+ RETURN(ERR_PTR(-ENOMEM));
/* We are disconnecting, do not retry a failed DISCONNECT rpc if
* it fails. We can get through the above with a down server
req->rq_timeout = min_t(int, req->rq_timeout,
INITIAL_CONNECT_TIMEOUT);
- IMPORT_SET_STATE(imp, LUSTRE_IMP_CONNECTING);
+ import_set_state(imp, LUSTRE_IMP_CONNECTING);
req->rq_send_state = LUSTRE_IMP_CONNECTING;
ptlrpc_request_set_replen(req);
spin_lock(&imp->imp_lock);
out:
if (noclose)
- IMPORT_SET_STATE_NOLOCK(imp, LUSTRE_IMP_DISCON);
+ import_set_state_nolock(imp, LUSTRE_IMP_DISCON);
else
- IMPORT_SET_STATE_NOLOCK(imp, LUSTRE_IMP_CLOSED);
+ import_set_state_nolock(imp, LUSTRE_IMP_CLOSED);
memset(&imp->imp_remote_handle, 0, sizeof(imp->imp_remote_handle));
spin_unlock(&imp->imp_lock);
struct obd_import *imp = req->rq_import;
int connect = 0;
- DEBUG_REQ(D_HA, req, "inflight=%d, refcount=%d: rc = %d ",
+ DEBUG_REQ(D_HA, req, "inflight=%d, refcount=%d: rc = %d",
atomic_read(&imp->imp_inflight),
atomic_read(&imp->imp_refcount), rc);
if (atomic_read(&imp->imp_inflight) > 1) {
imp->imp_generation++;
imp->imp_initiated_at = imp->imp_generation;
- IMPORT_SET_STATE_NOLOCK(imp, LUSTRE_IMP_NEW);
+ import_set_state_nolock(imp, LUSTRE_IMP_NEW);
ptlrpc_reset_reqs_generation(imp);
connect = 1;
}
}
- spin_unlock(&imp->imp_lock);
if (connect) {
- rc = ptlrpc_connect_import(imp);
+ rc = ptlrpc_connect_import_locked(imp);
if (rc >= 0)
ptlrpc_pinger_add_import(imp);
+ } else {
+ spin_unlock(&imp->imp_lock);
}
return 0;
ENTRY;
spin_lock(&imp->imp_lock);
- IMPORT_SET_STATE_NOLOCK(imp, LUSTRE_IMP_CLOSED);
+
+ import_set_state_nolock(imp, LUSTRE_IMP_CLOSED);
imp->imp_generation++;
- spin_unlock(&imp->imp_lock);
ptlrpc_abort_inflight(imp);
+ spin_unlock(&imp->imp_lock);
+
EXIT;
}
/* Adaptive Timeout utils */
-extern unsigned int at_min, at_max, at_history;
/* Update at_current with the specified value (bounded by at_min and at_max),
* as well as the AT history "bins".
git://git.whamcloud.com / fs / lustre-release.git / blobdiff