* Copyright (c) 2002, 2003 Cluster File Systems, Inc.
* Author: Mike Shaver <shaver@clusterfs.com>
*
- * This file is part of Lustre, http://www.lustre.org.
+ * This file is part of the Lustre file system, http://www.lustre.org
+ * Lustre is a trademark of Cluster File Systems, Inc.
*
- * Lustre is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * You may have signed or agreed to another license before downloading
+ * this software. If so, you are bound by the terms and conditions
+ * of that agreement, and the following does not apply to you. See the
+ * LICENSE file included with this distribution for more information.
*
- * Lustre is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * If you did not agree to a different license, then this copy of Lustre
+ * is open source software; you can redistribute it and/or modify it
+ * under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
*
- * You should have received a copy of the GNU General Public License
- * along with Lustre; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * In either case, Lustre is distributed in the hope that it will be
+ * useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * license text for more details.
*/
#define DEBUG_SUBSYSTEM S_RPC
return 0;
}
+EXPORT_SYMBOL(ptlrpc_init_import);
+
+#define UUID_STR "_UUID"
+static void deuuidify(char *uuid, const char *prefix, char **uuid_start, int *uuid_len)
+{
+ *uuid_start = !prefix || strncmp(uuid, prefix, strlen(prefix))
+ ? uuid : uuid + strlen(prefix);
+
+ *uuid_len = strlen(*uuid_start);
+
+ if (*uuid_len < strlen(UUID_STR))
+ return;
+
+ if (!strncmp(*uuid_start + *uuid_len - strlen(UUID_STR),
+ UUID_STR, strlen(UUID_STR)))
+ *uuid_len -= strlen(UUID_STR);
+}
/* Returns true if import was FULL, false if import was already not
* connected.
spin_lock_irqsave(&imp->imp_lock, flags);
if (imp->imp_state == LUSTRE_IMP_FULL) {
- CERROR("%s: connection lost to %s@%s\n",
- imp->imp_obd->obd_name,
- imp->imp_target_uuid.uuid,
- imp->imp_connection->c_remote_uuid.uuid);
+ char *target_start;
+ int target_len;
+
+ deuuidify(imp->imp_target_uuid.uuid, NULL,
+ &target_start, &target_len);
+
+ LCONSOLE_ERROR("Connection to service %.*s via nid %s was "
+ "lost; in progress operations using this "
+ "service will %s.\n",
+ target_len, target_start,
+ libcfs_nid2str(imp->imp_connection->c_peer.nid),
+ imp->imp_replayable
+ ? "wait for recovery to complete"
+ : "fail");
+
+ if (obd_dump_on_timeout)
+ libcfs_debug_dumplog();
+
+ CWARN("%s: connection lost to %s@%s\n",
+ imp->imp_obd->obd_name,
+ imp->imp_target_uuid.uuid,
+ imp->imp_connection->c_remote_uuid.uuid);
IMPORT_SET_STATE_NOLOCK(imp, LUSTRE_IMP_DISCON);
spin_unlock_irqrestore(&imp->imp_lock, flags);
obd_import_event(imp->imp_obd, imp, IMP_EVENT_DISCON);
ENTRY;
spin_lock_irqsave(&imp->imp_lock, flags);
- CDEBUG(D_HA, "setting import %s INVALID\n",
- imp->imp_target_uuid.uuid);
+ CDEBUG(D_HA, "setting import %s INVALID\n", imp->imp_target_uuid.uuid);
imp->imp_invalid = 1;
imp->imp_generation++;
spin_unlock_irqrestore(&imp->imp_lock, flags);
* for all the RPC completions, and finally notify the obd to
* invalidate its state (ie cancel locks, clear pending requests,
* etc).
- *
- * in_rpc: true if this is called while processing an rpc, like
- * CONNECT. It will allow for one RPC to be inflight while
- * waiting for requests to complete. Ugly, yes, but I don't see an
- * cleaner way right now.
*/
-void ptlrpc_invalidate_import(struct obd_import *imp, int in_rpc)
+void ptlrpc_invalidate_import(struct obd_import *imp)
{
struct l_wait_info lwi;
- unsigned long timeout;
- int inflight = 0;
int rc;
if (!imp->imp_invalid)
LASSERT(imp->imp_invalid);
- if (in_rpc)
- inflight = 1;
-
- /* wait for all requests to error out and call completion
- callbacks */
- if (imp->imp_server_timeout)
- timeout = obd_timeout / 2;
- else
- timeout = obd_timeout;
- timeout = MAX(timeout * HZ, 1);
- lwi = LWI_TIMEOUT_INTR(timeout, NULL, NULL, NULL);
- rc = l_wait_event(imp->imp_recovery_waitq,
- (atomic_read(&imp->imp_inflight) == inflight),
+ /* wait for all requests to error out and call completion callbacks */
+ lwi = LWI_TIMEOUT_INTR(MAX(obd_timeout * HZ, 1), NULL,
+ NULL, NULL);
+ rc = l_wait_event(imp->imp_recovery_waitq,
+ (atomic_read(&imp->imp_inflight) == 0),
&lwi);
if (rc)
- CERROR("%s: rc = %d waiting for callback (%d != %d)\n",
+ CERROR("%s: rc = %d waiting for callback (%d != 0)\n",
imp->imp_target_uuid.uuid, rc,
- atomic_read(&imp->imp_inflight), inflight);
+ atomic_read(&imp->imp_inflight));
obd_import_event(imp->imp_obd, imp, IMP_EVENT_INVALIDATE);
}
EXIT;
}
+/* still trying to connect */
+static int ptlrpc_import_in_connect(struct obd_import *imp)
+{
+ unsigned long flags;
+ int in_connect = 0;
+ spin_lock_irqsave(&imp->imp_lock, flags);
+ if (!imp->imp_invalid &&
+ (imp->imp_state == LUSTRE_IMP_CONNECTING ||
+ imp->imp_state == LUSTRE_IMP_DISCON))
+ in_connect = 1;
+ spin_unlock_irqrestore(&imp->imp_lock, flags);
+ return in_connect;
+}
+
+int ptlrpc_wait_for_connect(struct obd_import *imp)
+{
+ struct l_wait_info lwi;
+ int err;
+
+ lwi = LWI_INTR(NULL, NULL);
+ err = l_wait_event(imp->imp_recovery_waitq,
+ !ptlrpc_import_in_connect(imp), &lwi);
+ CERROR("wait got %d (%s, %d)\n", err,
+ ptlrpc_import_state_name(imp->imp_state),
+ imp->imp_invalid);
+ return (imp->imp_invalid ? -ETIMEDOUT : 0);
+}
+EXPORT_SYMBOL(ptlrpc_wait_for_connect);
+
+static int import_select_connection(struct obd_import *imp)
+{
+ struct obd_import_conn *imp_conn;
+ struct obd_export *dlmexp;
+ ENTRY;
+
+ spin_lock(&imp->imp_lock);
+
+ if (list_empty(&imp->imp_conn_list)) {
+ CERROR("%s: no connections available\n",
+ imp->imp_obd->obd_name);
+ spin_unlock(&imp->imp_lock);
+ RETURN(-EINVAL);
+ }
+
+ if (imp->imp_conn_current &&
+ imp->imp_conn_current->oic_item.next != &imp->imp_conn_list) {
+ imp_conn = list_entry(imp->imp_conn_current->oic_item.next,
+ struct obd_import_conn, oic_item);
+ } else {
+ imp_conn = list_entry(imp->imp_conn_list.next,
+ struct obd_import_conn, oic_item);
+ }
+
+ /* switch connection, don't mind if it's same as the current one */
+ if (imp->imp_connection)
+ ptlrpc_put_connection(imp->imp_connection);
+ imp->imp_connection = ptlrpc_connection_addref(imp_conn->oic_conn);
+
+ dlmexp = class_conn2export(&imp->imp_dlm_handle);
+ LASSERT(dlmexp != NULL);
+ if (dlmexp->exp_connection)
+ ptlrpc_put_connection(dlmexp->exp_connection);
+ dlmexp->exp_connection = ptlrpc_connection_addref(imp_conn->oic_conn);
+ class_export_put(dlmexp);
+
+ if (imp->imp_conn_current && (imp->imp_conn_current != imp_conn)) {
+ LCONSOLE_WARN("Changing connection for %s to %s\n",
+ imp->imp_obd->obd_name, imp_conn->oic_uuid.uuid);
+ }
+ imp->imp_conn_current = imp_conn;
+ CDEBUG(D_HA, "%s: import %p using connection %s\n",
+ imp->imp_obd->obd_name, imp, imp_conn->oic_uuid.uuid);
+ spin_unlock(&imp->imp_lock);
+
+ RETURN(0);
+}
+
int ptlrpc_connect_import(struct obd_import *imp, char * new_uuid)
{
struct obd_device *obd = imp->imp_obd;
- int initial_connect = 0;
+ int initial_connect = 0, first_try;
int rc;
__u64 committed_before_reconnect = 0;
struct ptlrpc_request *request;
int size[] = {sizeof(imp->imp_target_uuid),
- sizeof(obd->obd_uuid),
- sizeof(imp->imp_dlm_handle),
- sizeof(unsigned long)};
+ sizeof(obd->obd_uuid),
+ sizeof(imp->imp_dlm_handle),
+ sizeof(imp->imp_connect_data)};
char *tmp[] = {imp->imp_target_uuid.uuid,
obd->obd_uuid.uuid,
(char *)&imp->imp_dlm_handle,
- (char *)&imp->imp_connect_flags}; /* XXX: make this portable! */
+ (char *)&imp->imp_connect_data};
struct ptlrpc_connect_async_args *aa;
unsigned long flags;
IMPORT_SET_STATE_NOLOCK(imp, LUSTRE_IMP_CONNECTING);
+ imp->imp_conn_cnt++;
imp->imp_resend_replay = 0;
if (imp->imp_remote_handle.cookie == 0) {
initial_connect = 1;
} else {
- committed_before_reconnect = imp->imp_peer_committed_transno;;
- imp->imp_conn_cnt++;
+ committed_before_reconnect = imp->imp_peer_committed_transno;
}
-
spin_unlock_irqrestore(&imp->imp_lock, flags);
if (new_uuid) {
- struct ptlrpc_connection *conn;
struct obd_uuid uuid;
- struct obd_export *dlmexp;
obd_str2uuid(&uuid, new_uuid);
+ rc = import_set_conn_priority(imp, &uuid);
+ if (rc)
+ GOTO(out, rc);
+ }
- conn = ptlrpc_uuid_to_connection(&uuid);
- if (!conn)
- GOTO(out, rc = -ENOENT);
-
- CDEBUG(D_HA, "switching import %s/%s from %s to %s\n",
- imp->imp_target_uuid.uuid, imp->imp_obd->obd_name,
- imp->imp_connection->c_remote_uuid.uuid,
- conn->c_remote_uuid.uuid);
-
- /* Switch the import's connection and the DLM export's
- * connection (which are almost certainly the same, but we
- * keep distinct refs just to make things clearer. I think. */
- if (imp->imp_connection)
- ptlrpc_put_connection(imp->imp_connection);
- /* We hand off the ref from ptlrpc_get_connection. */
- imp->imp_connection = conn;
-
- dlmexp = class_conn2export(&imp->imp_dlm_handle);
-
- LASSERT(dlmexp != NULL);
-
- if (dlmexp->exp_connection)
- ptlrpc_put_connection(dlmexp->exp_connection);
- dlmexp->exp_connection = ptlrpc_connection_addref(conn);
- class_export_put(dlmexp);
+ first_try = (imp->imp_conn_current == NULL);
+ rc = import_select_connection(imp);
+ if (rc)
+ GOTO(out, rc);
+ if ((imp->imp_connect_data.ocd_connect_flags & OBD_CONNECT_BLOCK) &&
+ initial_connect && !first_try &&
+ (imp->imp_conn_current == list_entry(imp->imp_conn_list.next,
+ struct obd_import_conn,
+ oic_item))) {
+ /* Never connected, tried everyone, and nobody answered.
+ Give up; in-progress ops will fail (probably EIO) */
+ LCONSOLE_ERROR("All %d connections for %s failed; I am "
+ "deactivating the import.\n",
+ imp->imp_conn_cnt - 1,
+ imp->imp_target_uuid.uuid);
+ ptlrpc_deactivate_import(imp);
+ /* for ptlrpc_wait_for_connect */
+ wake_up(&imp->imp_recovery_waitq);
+ GOTO(out, rc = -ETIMEDOUT);
}
request = ptlrpc_prep_req(imp, imp->imp_connect_op, 4, size, tmp);
#endif
request->rq_send_state = LUSTRE_IMP_CONNECTING;
- request->rq_replen = lustre_msg_size(0, NULL);
+ /* Allow a slightly larger reply for future growth compatibility */
+ size[0] = sizeof(struct obd_connect_data) + 16 * sizeof(__u64);
+ request->rq_replen = lustre_msg_size(1, size);
request->rq_interpret_reply = ptlrpc_connect_interpret;
LASSERT (sizeof (*aa) <= sizeof (request->rq_async_args));
aa->pcaa_initial_connect = initial_connect;
if (aa->pcaa_initial_connect) {
- lustre_msg_add_op_flags(request->rq_reqmsg,
- MSG_CONNECT_INITIAL);
- imp->imp_replayable = 1;
+ imp->imp_replayable = 1;
+ /* On an initial connect, we don't know which one of a
+ failover server pair is up. Don't wait long. */
+ request->rq_timeout = max((int)(obd_timeout / 20), 5);
}
+ DEBUG_REQ(D_RPCTRACE, request, "(re)connect request");
ptlrpcd_add_req(request);
rc = 0;
- imp->imp_connect_start = jiffies;
out:
if (rc != 0) {
IMPORT_SET_STATE(imp, LUSTRE_IMP_DISCON);
RETURN(rc);
}
+EXPORT_SYMBOL(ptlrpc_connect_import);
+
+static void ptlrpc_maybe_ping_import_soon(struct obd_import *imp)
+{
+ struct obd_import_conn *imp_conn;
+ unsigned long flags;
+ int wake_pinger = 0;
+
+ ENTRY;
+
+ spin_lock_irqsave(&imp->imp_lock, flags);
+ if (list_empty(&imp->imp_conn_list))
+ GOTO(unlock, 0);
+
+ imp_conn = list_entry(imp->imp_conn_list.prev,
+ struct obd_import_conn,
+ oic_item);
+
+ if (imp->imp_conn_current != imp_conn) {
+ ptlrpc_ping_import_soon(imp);
+ wake_pinger = 1;
+ }
+
+ unlock:
+ spin_unlock_irqrestore(&imp->imp_lock, flags);
+
+ if (wake_pinger)
+ ptlrpc_pinger_wake_up();
+
+ EXIT;
+}
static int ptlrpc_connect_interpret(struct ptlrpc_request *request,
void * data, int rc)
if (rc)
GOTO(out, rc);
+ LASSERT(imp->imp_conn_current);
+
msg_flags = lustre_msg_get_op_flags(request->rq_repmsg);
+ /* All imports are pingable */
+ imp->imp_pingable = 1;
+
if (aa->pcaa_initial_connect) {
if (msg_flags & MSG_CONNECT_REPLAYABLE) {
CDEBUG(D_HA, "connected to replayable target: %s\n",
imp->imp_target_uuid.uuid);
- imp->imp_pingable = imp->imp_replayable = 1;
+ imp->imp_replayable = 1;
} else {
imp->imp_replayable = 0;
}
- LASSERTF(imp->imp_conn_cnt < request->rq_repmsg->conn_cnt,
- "imp conn_cnt %d req conn_cnt %d",
- imp->imp_conn_cnt, request->rq_repmsg->conn_cnt);
- imp->imp_conn_cnt = request->rq_repmsg->conn_cnt;
imp->imp_remote_handle = request->rq_repmsg->handle;
+
IMPORT_SET_STATE(imp, LUSTRE_IMP_FULL);
GOTO(finish, rc = 0);
}
request->rq_repmsg->handle.cookie);
imp->imp_remote_handle = request->rq_repmsg->handle;
} else {
- CERROR("reconnected to %s@%s after partition\n",
+ CDEBUG(D_HA, "reconnected to %s@%s after partition\n",
imp->imp_target_uuid.uuid,
imp->imp_connection->c_remote_uuid.uuid);
}
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_obd->obd_name,
imp->imp_target_uuid.uuid);
imp->imp_resend_replay = 1;
IMPORT_SET_STATE(imp, LUSTRE_IMP_REPLAY);
imp->imp_last_replay_transno = 0;
IMPORT_SET_STATE(imp, LUSTRE_IMP_REPLAY);
} else {
- CWARN("oops! we get evicted from %s\n", imp->imp_target_uuid.uuid);
imp->imp_remote_handle = request->rq_repmsg->handle;
IMPORT_SET_STATE(imp, LUSTRE_IMP_EVICTED);
}
ptlrpc_connect_import(imp, NULL);
RETURN(0);
}
+ } else {
+ struct obd_connect_data *ocd;
+
+ ocd = lustre_swab_repbuf(request, 0,
+ sizeof *ocd, lustre_swab_connect);
+ if (ocd == NULL) {
+ CERROR("Wrong connect data from server\n");
+ rc = -EPROTO;
+ GOTO(out, rc);
+ }
+ spin_lock_irqsave(&imp->imp_lock, flags);
+ /*
+ * check that server granted subset of flags we asked for.
+ */
+ LASSERT((ocd->ocd_connect_flags &
+ imp->imp_connect_data.ocd_connect_flags) ==
+ ocd->ocd_connect_flags);
+ imp->imp_connect_data = *ocd;
+ if (imp->imp_conn_current != NULL) {
+ list_del(&imp->imp_conn_current->oic_item);
+ list_add(&imp->imp_conn_current->oic_item,
+ &imp->imp_conn_list);
+ imp->imp_conn_current = NULL;
+ spin_unlock_irqrestore(&imp->imp_lock, flags);
+ } else {
+ static int bug7269_dump = 0;
+ spin_unlock_irqrestore(&imp->imp_lock, flags);
+ CERROR("this is bug 7269 - please attach log there\n");
+ if (bug7269_dump == 0)
+ libcfs_debug_dumplog();
+ bug7269_dump = 1;
+ }
}
+
out:
if (rc != 0) {
IMPORT_SET_STATE(imp, LUSTRE_IMP_DISCON);
if (aa->pcaa_initial_connect && !imp->imp_initial_recov) {
ptlrpc_deactivate_import(imp);
}
- if (rc == -ETIMEDOUT && (jiffies - imp->imp_connect_start) > HZ) {
- CDEBUG(D_ERROR, "recovery of %s on %s failed (timeout)\n",
- imp->imp_target_uuid.uuid,
- (char *)imp->imp_connection->c_remote_uuid.uuid);
- ptlrpc_connect_import(imp, NULL);
- RETURN(0);
- }
- CDEBUG(D_ERROR, "recovery of %s on %s failed (%d)\n",
+
+ ptlrpc_maybe_ping_import_soon(imp);
+
+ CDEBUG(D_HA, "recovery of %s on %s failed (%d)\n",
imp->imp_target_uuid.uuid,
(char *)imp->imp_connection->c_remote_uuid.uuid, rc);
}
ptlrpc_import_recovery_state_machine(req->rq_import);
} else {
CDEBUG(D_HA, "%s: LAST_REPLAY message error: %d, "
- "reconnecting\n",
+ "reconnecting\n",
req->rq_import->imp_obd->obd_name, req->rq_status);
ptlrpc_connect_import(req->rq_import, NULL);
}
}
static int signal_completed_replay(struct obd_import *imp)
- {
+{
struct ptlrpc_request *req;
ENTRY;
atomic_inc(&imp->imp_replay_inflight);
req = ptlrpc_prep_req(imp, OBD_PING, 0, NULL, NULL);
- if (!req)
+ if (!req) {
+ atomic_dec(&imp->imp_replay_inflight);
RETURN(-ENOMEM);
+ }
req->rq_replen = lustre_msg_size(0, NULL);
req->rq_send_state = LUSTRE_IMP_REPLAY_WAIT;
RETURN(0);
}
+#ifdef __KERNEL__
+static int ptlrpc_invalidate_import_thread(void *data)
+{
+ struct obd_import *imp = data;
+ unsigned long flags;
+
+ ENTRY;
+
+ lock_kernel();
+ ptlrpc_daemonize();
+
+ SIGNAL_MASK_LOCK(current, flags);
+ sigfillset(¤t->blocked);
+ RECALC_SIGPENDING;
+ SIGNAL_MASK_UNLOCK(current, flags);
+ THREAD_NAME(current->comm, sizeof(current->comm), "ll_imp_inval");
+ unlock_kernel();
+
+ CDEBUG(D_HA, "thread invalidate import %s to %s@%s\n",
+ imp->imp_obd->obd_name, imp->imp_target_uuid.uuid,
+ imp->imp_connection->c_remote_uuid.uuid);
+
+ ptlrpc_invalidate_import(imp);
+
+ IMPORT_SET_STATE(imp, LUSTRE_IMP_RECOVER);
+ ptlrpc_import_recovery_state_machine(imp);
+
+ RETURN(0);
+}
+#endif
+
int ptlrpc_import_recovery_state_machine(struct obd_import *imp)
{
int rc = 0;
int inflight;
+ char *target_start;
+ int target_len;
if (imp->imp_state == LUSTRE_IMP_EVICTED) {
+ deuuidify(imp->imp_target_uuid.uuid, NULL,
+ &target_start, &target_len);
+ LCONSOLE_ERROR("This client was evicted by %.*s; in progress "
+ "operations using this service will fail.\n",
+ target_len, target_start);
CDEBUG(D_HA, "evicted from %s@%s; invalidating\n",
imp->imp_target_uuid.uuid,
imp->imp_connection->c_remote_uuid.uuid);
- ptlrpc_invalidate_import(imp, 1);
+#ifdef __KERNEL__
+ rc = kernel_thread(ptlrpc_invalidate_import_thread, imp,
+ CLONE_VM | CLONE_FILES);
+ if (rc < 0)
+ CERROR("error starting invalidate thread: %d\n", rc);
+ else
+ rc = 0;
+ RETURN(rc);
+#else
+ ptlrpc_invalidate_import(imp);
IMPORT_SET_STATE(imp, LUSTRE_IMP_RECOVER);
+#endif
}
if (imp->imp_state == LUSTRE_IMP_REPLAY) {
}
if (imp->imp_state == LUSTRE_IMP_RECOVER) {
+ char *nidstr;
+
CDEBUG(D_HA, "reconnected to %s@%s\n",
imp->imp_target_uuid.uuid,
imp->imp_connection->c_remote_uuid.uuid);
GOTO(out, rc);
IMPORT_SET_STATE(imp, LUSTRE_IMP_FULL);
ptlrpc_activate_import(imp);
- CERROR("%s: connection restored to %s@%s\n",
- imp->imp_obd->obd_name,
- imp->imp_target_uuid.uuid,
- imp->imp_connection->c_remote_uuid.uuid);
+
+ deuuidify(imp->imp_target_uuid.uuid, NULL,
+ &target_start, &target_len);
+ nidstr = libcfs_nid2str(imp->imp_connection->c_peer.nid);
+
+ LCONSOLE_INFO("Connection restored to service %.*s using nid "
+ "%s.\n", target_len, target_start, nidstr);
+
+ CWARN("%s: connection restored to %s@%s\n",
+ imp->imp_obd->obd_name,
+ imp->imp_target_uuid.uuid,
+ imp->imp_connection->c_remote_uuid.uuid);
}
if (imp->imp_state == LUSTRE_IMP_FULL) {
static int back_to_sleep(void *unused)
{
- return 0;
+ return 0;
}
int ptlrpc_disconnect_import(struct obd_import *imp)
switch (imp->imp_connect_op) {
case OST_CONNECT: rq_opc = OST_DISCONNECT; break;
case MDS_CONNECT: rq_opc = MDS_DISCONNECT; break;
- case MGMT_CONNECT:rq_opc = MGMT_DISCONNECT;break;
default:
CERROR("don't know how to disconnect from %s (connect_op %d)\n",
imp->imp_target_uuid.uuid, imp->imp_connect_op);
RETURN(-EINVAL);
}
-
if (ptlrpc_import_in_recovery(imp)) {
struct l_wait_info lwi;
- unsigned long timeout;
- if (imp->imp_server_timeout)
- timeout = obd_timeout / 2;
- else
- timeout = obd_timeout;
- timeout = MAX(timeout * HZ, 1);
- lwi = LWI_TIMEOUT_INTR(obd_timeout, back_to_sleep, NULL, NULL);
- rc = l_wait_event(imp->imp_recovery_waitq,
+ lwi = LWI_TIMEOUT_INTR(MAX(obd_timeout * HZ, 1), back_to_sleep,
+ NULL, NULL);
+ rc = l_wait_event(imp->imp_recovery_waitq,
!ptlrpc_import_in_recovery(imp), &lwi);
}
spin_lock_irqsave(&imp->imp_lock, flags);
- if (imp->imp_state != LUSTRE_IMP_FULL) {
+ if (imp->imp_state != LUSTRE_IMP_FULL)
GOTO(out, 0);
- }
+
spin_unlock_irqrestore(&imp->imp_lock, flags);
request = ptlrpc_prep_req(imp, rq_opc, 0, NULL, NULL);
if (request) {
- /* For non-replayable connections, don't attempt
- reconnect if this fails */
- if (!imp->imp_replayable) {
- request->rq_no_resend = 1;
- IMPORT_SET_STATE(imp, LUSTRE_IMP_CONNECTING);
- request->rq_send_state = LUSTRE_IMP_CONNECTING;
- }
+ /* We are disconnecting, do not retry a failed DISCONNECT rpc if
+ * it fails. We can get through the above with a down server
+ * if the client doesn't know the server is gone yet. */
+ request->rq_no_resend = 1;
+ request->rq_timeout = 5;
+ IMPORT_SET_STATE(imp, LUSTRE_IMP_CONNECTING);
+ request->rq_send_state = LUSTRE_IMP_CONNECTING;
request->rq_replen = lustre_msg_size(0, NULL);
rc = ptlrpc_queue_wait(request);
ptlrpc_req_finished(request);
out:
IMPORT_SET_STATE_NOLOCK(imp, LUSTRE_IMP_CLOSED);
memset(&imp->imp_remote_handle, 0, sizeof(imp->imp_remote_handle));
- imp->imp_conn_cnt = 0;
spin_unlock_irqrestore(&imp->imp_lock, flags);
RETURN(rc);
git://git.whamcloud.com / fs / lustre-release.git / blobdiff