*/
#define DEBUG_SUBSYSTEM S_RPC
-#ifdef __KERNEL__
-# include <linux/config.h>
-# include <linux/module.h>
-# include <linux/kmod.h>
-#else
+#ifndef __KERNEL__
# include <liblustre.h>
#endif
#include <linux/lustre_export.h>
#include <linux/obd.h>
#include <linux/obd_class.h>
+#include <linux/lustre_sec.h>
#include "ptlrpc_internal.h"
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);
+ 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);
+ ptlrpc_deactivate_timeouts();
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);
if (rc)
CERROR("%s: rc = %d waiting for callback (%d != %d)\n",
imp->imp_target_uuid.uuid, rc,
- atomic_read(&imp->imp_inflight), inflight);
+ atomic_read(&imp->imp_inflight), !!in_rpc);
obd_import_event(imp->imp_obd, imp, IMP_EVENT_INVALIDATE);
}
spin_unlock_irqrestore(&imp->imp_lock, flags);
obd_import_event(obd, imp, IMP_EVENT_ACTIVE);
+ ptlrpc_activate_timeouts();
}
void ptlrpc_fail_import(struct obd_import *imp, int generation)
list_add_tail(&tmp->oic_item, &imp->imp_conn_list);
}
- /* 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);
+ /* switch connection if we chose a new one */
+ if (imp->imp_connection != imp_conn->oic_conn) {
+ if (imp->imp_connection) {
+ ptlrpcs_sec_invalidate_cache(imp->imp_sec);
+ 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);
RETURN(0);
}
-
+/*
+ * must be called under imp_lock
+ */
+int ptlrpc_first_transno(struct obd_import *imp, __u64 *transno)
+{
+ struct ptlrpc_request *req;
+ struct list_head *tmp;
+
+ if (list_empty(&imp->imp_replay_list))
+ return 0;
+ tmp = imp->imp_replay_list.next;
+ req = list_entry(tmp, struct ptlrpc_request, rq_replay_list);
+ *transno = req->rq_transno;
+ return 1;
+}
int ptlrpc_connect_import(struct obd_import *imp, char * new_uuid)
{
struct obd_device *obd = imp->imp_obd;
int initial_connect = 0;
+ int set_transno = 0;
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)};
- char *tmp[] = {imp->imp_target_uuid.uuid,
- obd->obd_uuid.uuid,
+ int size[] = {0,
+ sizeof(imp->imp_target_uuid),
+ sizeof(obd->obd_uuid),
+ sizeof(imp->imp_dlm_handle),
+ sizeof(imp->imp_connect_flags),
+ sizeof(imp->imp_connect_data)};
+ char *tmp[] = {NULL,
+ (char *)imp->imp_target_uuid.uuid,
+ (char *)obd->obd_uuid.uuid,
(char *)&imp->imp_dlm_handle,
- (char *)&imp->imp_connect_flags}; /* XXX: make this portable! */
+ (char *)&imp->imp_connect_flags, /* XXX: make this portable! */
+ (char*) &imp->imp_connect_data};
+ int repsize = sizeof(struct obd_connect_data);
+
struct ptlrpc_connect_async_args *aa;
unsigned long flags;
imp->imp_conn_cnt++;
}
+ set_transno = ptlrpc_first_transno(imp, &imp->imp_connect_data.transno);
spin_unlock_irqrestore(&imp->imp_lock, flags);
if (rc)
GOTO(out, rc);
+ LASSERT(imp->imp_sec);
+
+ size[0] = lustre_secdesc_size();
request = ptlrpc_prep_req(imp, LUSTRE_OBD_VERSION,
- imp->imp_connect_op, 4, size, tmp);
+ imp->imp_connect_op, 6, size, tmp);
if (!request)
GOTO(out, rc = -ENOMEM);
+ lustre_pack_secdesc(request, size[0]);
+
#ifndef __KERNEL__
lustre_msg_add_op_flags(request->rq_reqmsg, MSG_CONNECT_LIBCLIENT);
#endif
+ if (obd->u.cli.cl_async) {
+ lustre_msg_add_op_flags(request->rq_reqmsg, MSG_CONNECT_ASYNC);
+ }
request->rq_send_state = LUSTRE_IMP_CONNECTING;
- request->rq_replen = lustre_msg_size(0, NULL);
+ request->rq_replen = lustre_msg_size(1, &repsize);
request->rq_interpret_reply = ptlrpc_connect_interpret;
LASSERT (sizeof (*aa) <= sizeof (request->rq_async_args));
MSG_CONNECT_INITIAL);
imp->imp_replayable = 1;
}
+ if (set_transno)
+ lustre_msg_add_op_flags(request->rq_reqmsg,
+ MSG_CONNECT_TRANSNO);
+
+ imp->imp_reqs_replayed = imp->imp_locks_replayed = 0;
ptlrpcd_add_req(request);
rc = 0;
GOTO(out, rc);
LASSERT(imp->imp_conn_current);
imp->imp_conn_current->oic_last_attempt = 0;
-
+/*
+ remote_flag = lustre_msg_buf(request->rq_repmsg, 0, sizeof(int));
+ LASSERT(remote_flag != NULL);
+ imp->imp_obd->u.cli.cl_remote = *remote_flag;
+*/
msg_flags = lustre_msg_get_op_flags(request->rq_repmsg);
if (aa->pcaa_initial_connect) {
+ struct obd_connect_data *conn_data;
+
+ conn_data = lustre_swab_repbuf(request, 0, sizeof(*conn_data),
+ lustre_swab_connect);
+ LASSERT(conn_data);
+ imp->imp_connect_data.ocd_connect_flags =
+ conn_data->ocd_connect_flags;
+
if (msg_flags & MSG_CONNECT_REPLAYABLE) {
CDEBUG(D_HA, "connected to replayable target: %s\n",
imp->imp_target_uuid.uuid);
imp->imp_conn_cnt = request->rq_repmsg->conn_cnt;
imp->imp_remote_handle = request->rq_repmsg->handle;
IMPORT_SET_STATE(imp, LUSTRE_IMP_FULL);
+ ptlrpc_pinger_sending_on_import(imp);
GOTO(finish, rc = 0);
}
}
finish:
+ imp->imp_debug_open_replays = 1;
rc = ptlrpc_import_recovery_state_machine(imp);
if (rc != 0) {
if (rc == -ENOTCONN) {
atomic_inc(&imp->imp_replay_inflight);
req = ptlrpc_prep_req(imp, LUSTRE_OBD_VERSION, 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;
- req->rq_reqmsg->flags |= MSG_LAST_REPLAY;
+ req->rq_reqmsg->flags |= MSG_LOCK_REPLAY_DONE | MSG_REQ_REPLAY_DONE;
req->rq_timeout *= 3;
req->rq_interpret_reply = completed_replay_interpret;
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, 0);
+ 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;
imp->imp_target_uuid.uuid,
imp->imp_connection->c_remote_uuid.uuid);
+#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);
+ RETURN(rc < 0 ? rc : 0);
+#else
ptlrpc_invalidate_import(imp, 1);
IMPORT_SET_STATE(imp, LUSTRE_IMP_RECOVER);
+#endif
}
if (imp->imp_state == LUSTRE_IMP_REPLAY) {
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);
+ CWARN("%s: connection restored to %s@%s, "
+ "%d/%d req/lock replayed\n",
+ imp->imp_obd->obd_name,
+ imp->imp_target_uuid.uuid,
+ imp->imp_connection->c_remote_uuid.uuid,
+ imp->imp_reqs_replayed,
+ imp->imp_locks_replayed);
}
if (imp->imp_state == LUSTRE_IMP_FULL) {
case OST_CONNECT: rq_opc = OST_DISCONNECT; break;
case MDS_CONNECT: rq_opc = MDS_DISCONNECT; break;
case MGMT_CONNECT: rq_opc = MGMT_DISCONNECT; break;
+ case GKS_CONNECT: rq_opc = GKS_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);
git://git.whamcloud.com / fs / lustre-release.git / blobdiff