/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
* vim:expandtab:shiftwidth=8:tabstop=8:
*
- * Copyright (c) 2003 Cluster File Systems, Inc.
+ * GPL HEADER START
*
- * This file is part of the Lustre file system, http://www.lustre.org
- * Lustre is a trademark of Cluster File Systems, Inc.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * 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.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 only,
+ * as published by the Free Software Foundation.
*
- * 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.
+ * This program 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 version 2 for more details (a copy is included
+ * in the LICENSE file that accompanied this code).
*
- * 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.
+ * You should have received a copy of the GNU General Public License
+ * version 2 along with this program; If not, see
+ * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ *
+ * GPL HEADER END
+ */
+/*
+ * Copyright 2008 Sun Microsystems, Inc. All rights reserved
+ * Use is subject to license terms.
+ */
+/*
+ * This file is part of Lustre, http://www.lustre.org/
+ * Lustre is a trademark of Sun Microsystems, Inc.
*/
#ifndef EXPORT_SYMTAB
#include <lustre_sec.h>
#include "ldlm_internal.h"
-
/* @priority: if non-zero, move the selected to the list head
* @create: if zero, only search in existed connections
*/
}
}
- spin_lock(&imp->imp_lock);
- list_for_each_entry(item, &imp->imp_conn_list, oic_item) {
+ cfs_spin_lock(&imp->imp_lock);
+ cfs_list_for_each_entry(item, &imp->imp_conn_list, oic_item) {
if (obd_uuid_equals(uuid, &item->oic_uuid)) {
if (priority) {
- list_del(&item->oic_item);
- list_add(&item->oic_item, &imp->imp_conn_list);
+ cfs_list_del(&item->oic_item);
+ cfs_list_add(&item->oic_item,
+ &imp->imp_conn_list);
item->oic_last_attempt = 0;
}
CDEBUG(D_HA, "imp %p@%s: found existing conn %s%s\n",
imp, imp->imp_obd->obd_name, uuid->uuid,
(priority ? ", moved to head" : ""));
- spin_unlock(&imp->imp_lock);
+ cfs_spin_unlock(&imp->imp_lock);
GOTO(out_free, rc = 0);
}
}
if (create) {
imp_conn->oic_conn = ptlrpc_conn;
imp_conn->oic_uuid = *uuid;
- item->oic_last_attempt = 0;
+ imp_conn->oic_last_attempt = 0;
if (priority)
- list_add(&imp_conn->oic_item, &imp->imp_conn_list);
+ cfs_list_add(&imp_conn->oic_item, &imp->imp_conn_list);
else
- list_add_tail(&imp_conn->oic_item, &imp->imp_conn_list);
+ cfs_list_add_tail(&imp_conn->oic_item,
+ &imp->imp_conn_list);
CDEBUG(D_HA, "imp %p@%s: add connection %s at %s\n",
imp, imp->imp_obd->obd_name, uuid->uuid,
(priority ? "head" : "tail"));
} else {
- spin_unlock(&imp->imp_lock);
+ cfs_spin_unlock(&imp->imp_lock);
GOTO(out_free, rc = -ENOENT);
}
- spin_unlock(&imp->imp_lock);
+ cfs_spin_unlock(&imp->imp_lock);
RETURN(0);
out_free:
if (imp_conn)
OBD_FREE(imp_conn, sizeof(*imp_conn));
out_put:
- ptlrpc_put_connection(ptlrpc_conn);
+ ptlrpc_connection_put(ptlrpc_conn);
RETURN(rc);
}
int rc = -ENOENT;
ENTRY;
- spin_lock(&imp->imp_lock);
- if (list_empty(&imp->imp_conn_list)) {
+ cfs_spin_lock(&imp->imp_lock);
+ if (cfs_list_empty(&imp->imp_conn_list)) {
LASSERT(!imp->imp_connection);
GOTO(out, rc);
}
- list_for_each_entry(imp_conn, &imp->imp_conn_list, oic_item) {
+ cfs_list_for_each_entry(imp_conn, &imp->imp_conn_list, oic_item) {
if (!obd_uuid_equals(uuid, &imp_conn->oic_uuid))
continue;
LASSERT(imp_conn->oic_conn);
GOTO(out, rc = -EBUSY);
}
- ptlrpc_put_connection(imp->imp_connection);
+ ptlrpc_connection_put(imp->imp_connection);
imp->imp_connection = NULL;
dlmexp = class_conn2export(&imp->imp_dlm_handle);
if (dlmexp && dlmexp->exp_connection) {
LASSERT(dlmexp->exp_connection ==
imp_conn->oic_conn);
- ptlrpc_put_connection(dlmexp->exp_connection);
+ ptlrpc_connection_put(dlmexp->exp_connection);
dlmexp->exp_connection = NULL;
}
}
- list_del(&imp_conn->oic_item);
- ptlrpc_put_connection(imp_conn->oic_conn);
+ cfs_list_del(&imp_conn->oic_item);
+ ptlrpc_connection_put(imp_conn->oic_conn);
OBD_FREE(imp_conn, sizeof(*imp_conn));
CDEBUG(D_HA, "imp %p@%s: remove connection %s\n",
imp, imp->imp_obd->obd_name, uuid->uuid);
break;
}
out:
- spin_unlock(&imp->imp_lock);
+ cfs_spin_unlock(&imp->imp_lock);
if (rc == -ENOENT)
CERROR("connection %s not found\n", uuid->uuid);
RETURN(rc);
}
-static void destroy_import(struct obd_import *imp)
+void client_destroy_import(struct obd_import *imp)
{
/* drop security policy instance after all rpc finished/aborted
- * to let all busy credentials be released.
- */
+ * to let all busy contexts be released. */
class_import_get(imp);
class_destroy_import(imp);
- sptlrpc_import_put_sec(imp);
+ sptlrpc_import_sec_put(imp);
class_import_put(imp);
}
rq_portal = OST_REQUEST_PORTAL;
rp_portal = OSC_REPLY_PORTAL;
connect_op = OST_CONNECT;
+ cli->cl_sp_me = LUSTRE_SP_CLI;
+ cli->cl_sp_to = LUSTRE_SP_OST;
} else if (!strcmp(name, LUSTRE_MDC_NAME)) {
rq_portal = MDS_REQUEST_PORTAL;
rp_portal = MDC_REPLY_PORTAL;
connect_op = MDS_CONNECT;
+ cli->cl_sp_me = LUSTRE_SP_CLI;
+ cli->cl_sp_to = LUSTRE_SP_MDT;
} else if (!strcmp(name, LUSTRE_MGC_NAME)) {
rq_portal = MGS_REQUEST_PORTAL;
rp_portal = MGC_REPLY_PORTAL;
connect_op = MGS_CONNECT;
+ cli->cl_sp_me = LUSTRE_SP_MGC;
+ cli->cl_sp_to = LUSTRE_SP_MGS;
+ cli->cl_flvr_mgc.sf_rpc = SPTLRPC_FLVR_INVALID;
} else {
CERROR("unknown client OBD type \"%s\", can't setup\n",
name);
RETURN(-EINVAL);
}
- sema_init(&cli->cl_sem, 1);
- sema_init(&cli->cl_mgc_sem, 1);
- cli->cl_sec_conf.sfc_rpc_flavor = SPTLRPC_FLVR_NULL;
- cli->cl_sec_conf.sfc_bulk_csum = BULK_CSUM_ALG_NULL;
- cli->cl_sec_conf.sfc_bulk_priv = BULK_PRIV_ALG_NULL;
- cli->cl_sec_conf.sfc_flags = 0;
+ cfs_init_rwsem(&cli->cl_sem);
+ cfs_sema_init(&cli->cl_mgc_sem, 1);
cli->cl_conn_count = 0;
memcpy(server_uuid.uuid, lustre_cfg_buf(lcfg, 2),
min_t(unsigned int, LUSTRE_CFG_BUFLEN(lcfg, 2),
cli->cl_avail_grant = 0;
/* FIXME: should limit this for the sum of all cl_dirty_max */
cli->cl_dirty_max = OSC_MAX_DIRTY_DEFAULT * 1024 * 1024;
- if (cli->cl_dirty_max >> CFS_PAGE_SHIFT > num_physpages / 8)
- cli->cl_dirty_max = num_physpages << (CFS_PAGE_SHIFT - 3);
+ if (cli->cl_dirty_max >> CFS_PAGE_SHIFT > cfs_num_physpages / 8)
+ cli->cl_dirty_max = cfs_num_physpages << (CFS_PAGE_SHIFT - 3);
CFS_INIT_LIST_HEAD(&cli->cl_cache_waiters);
CFS_INIT_LIST_HEAD(&cli->cl_loi_ready_list);
+ CFS_INIT_LIST_HEAD(&cli->cl_loi_hp_ready_list);
CFS_INIT_LIST_HEAD(&cli->cl_loi_write_list);
CFS_INIT_LIST_HEAD(&cli->cl_loi_read_list);
client_obd_list_lock_init(&cli->cl_loi_list_lock);
cli->cl_r_in_flight = 0;
cli->cl_w_in_flight = 0;
- spin_lock_init(&cli->cl_read_rpc_hist.oh_lock);
- spin_lock_init(&cli->cl_write_rpc_hist.oh_lock);
- spin_lock_init(&cli->cl_read_page_hist.oh_lock);
- spin_lock_init(&cli->cl_write_page_hist.oh_lock);
- spin_lock_init(&cli->cl_read_offset_hist.oh_lock);
- spin_lock_init(&cli->cl_write_offset_hist.oh_lock);
+ cfs_spin_lock_init(&cli->cl_read_rpc_hist.oh_lock);
+ cfs_spin_lock_init(&cli->cl_write_rpc_hist.oh_lock);
+ cfs_spin_lock_init(&cli->cl_read_page_hist.oh_lock);
+ cfs_spin_lock_init(&cli->cl_write_page_hist.oh_lock);
+ cfs_spin_lock_init(&cli->cl_read_offset_hist.oh_lock);
+ cfs_spin_lock_init(&cli->cl_write_offset_hist.oh_lock);
cfs_waitq_init(&cli->cl_destroy_waitq);
- atomic_set(&cli->cl_destroy_in_flight, 0);
+ cfs_atomic_set(&cli->cl_destroy_in_flight, 0);
#ifdef ENABLE_CHECKSUM
+ /* Turn on checksumming by default. */
cli->cl_checksum = 1;
+ /*
+ * The supported checksum types will be worked out at connect time
+ * Set cl_chksum* to CRC32 for now to avoid returning screwed info
+ * through procfs.
+ */
+ cli->cl_cksum_type = cli->cl_supp_cksum_types = OBD_CKSUM_CRC32;
#endif
- atomic_set(&cli->cl_resends, OSC_DEFAULT_RESENDS);
+ cfs_atomic_set(&cli->cl_resends, OSC_DEFAULT_RESENDS);
/* This value may be changed at connect time in
ptlrpc_connect_interpret. */
if (!strcmp(name, LUSTRE_MDC_NAME)) {
cli->cl_max_rpcs_in_flight = MDC_MAX_RIF_DEFAULT;
- } else if (num_physpages >> (20 - CFS_PAGE_SHIFT) <= 128 /* MB */) {
+ } else if (cfs_num_physpages >> (20 - CFS_PAGE_SHIFT) <= 128 /* MB */) {
cli->cl_max_rpcs_in_flight = 2;
- } else if (num_physpages >> (20 - CFS_PAGE_SHIFT) <= 256 /* MB */) {
+ } else if (cfs_num_physpages >> (20 - CFS_PAGE_SHIFT) <= 256 /* MB */) {
cli->cl_max_rpcs_in_flight = 3;
- } else if (num_physpages >> (20 - CFS_PAGE_SHIFT) <= 512 /* MB */) {
+ } else if (cfs_num_physpages >> (20 - CFS_PAGE_SHIFT) <= 512 /* MB */) {
cli->cl_max_rpcs_in_flight = 4;
} else {
cli->cl_max_rpcs_in_flight = OSC_MAX_RIF_DEFAULT;
cli->cl_import = imp;
/* cli->cl_max_mds_{easize,cookiesize} updated by mdc_init_ea_size() */
- cli->cl_max_mds_easize = sizeof(struct lov_mds_md);
+ cli->cl_max_mds_easize = sizeof(struct lov_mds_md_v3);
cli->cl_max_mds_cookiesize = sizeof(struct llog_cookie);
if (LUSTRE_CFG_BUFLEN(lcfg, 3) > 0) {
CDEBUG(D_HA, "marking %s %s->%s as inactive\n",
name, obddev->obd_name,
cli->cl_target_uuid.uuid);
- spin_lock(&imp->imp_lock);
- imp->imp_invalid = 1;
- spin_unlock(&imp->imp_lock);
+ cfs_spin_lock(&imp->imp_lock);
+ imp->imp_deactive = 1;
+ cfs_spin_unlock(&imp->imp_lock);
}
}
+ obddev->obd_namespace = ldlm_namespace_new(obddev, obddev->obd_name,
+ LDLM_NAMESPACE_CLIENT,
+ LDLM_NAMESPACE_GREEDY);
+ if (obddev->obd_namespace == NULL) {
+ CERROR("Unable to create client namespace - %s\n",
+ obddev->obd_name);
+ GOTO(err_import, rc = -ENOMEM);
+ }
+
cli->cl_qchk_stat = CL_NOT_QUOTACHECKED;
RETURN(rc);
err_import:
class_destroy_import(imp);
err_ldlm:
- ldlm_put_ref(0);
+ ldlm_put_ref();
err:
RETURN(rc);
int client_obd_cleanup(struct obd_device *obddev)
{
ENTRY;
- ldlm_put_ref(obddev->obd_force);
+
+ ldlm_namespace_free_post(obddev->obd_namespace);
+ obddev->obd_namespace = NULL;
+
+ ldlm_put_ref();
RETURN(0);
}
/* ->o_connect() method for client side (OSC and MDC and MGC) */
int client_connect_import(const struct lu_env *env,
- struct lustre_handle *dlm_handle,
+ struct obd_export **exp,
struct obd_device *obd, struct obd_uuid *cluuid,
- struct obd_connect_data *data)
+ struct obd_connect_data *data, void *localdata)
{
struct client_obd *cli = &obd->u.cli;
struct obd_import *imp = cli->cl_import;
- struct obd_export *exp;
struct obd_connect_data *ocd;
- struct ldlm_namespace *to_be_freed = NULL;
+ struct lustre_handle conn = { 0 };
int rc;
ENTRY;
- mutex_down(&cli->cl_sem);
- rc = class_connect(dlm_handle, obd, cluuid);
+ *exp = NULL;
+ cfs_down_write(&cli->cl_sem);
+ if (cli->cl_conn_count > 0 )
+ GOTO(out_sem, rc = -EALREADY);
+
+ rc = class_connect(&conn, obd, cluuid);
if (rc)
GOTO(out_sem, rc);
cli->cl_conn_count++;
- if (cli->cl_conn_count > 1)
- GOTO(out_sem, rc);
- exp = class_conn2export(dlm_handle);
+ *exp = class_conn2export(&conn);
- if (obd->obd_namespace != NULL)
- CERROR("already have namespace!\n");
- obd->obd_namespace = ldlm_namespace_new(obd->obd_name,
- LDLM_NAMESPACE_CLIENT,
- LDLM_NAMESPACE_GREEDY);
- if (obd->obd_namespace == NULL)
- GOTO(out_disco, rc = -ENOMEM);
+ LASSERT(obd->obd_namespace);
- imp->imp_dlm_handle = *dlm_handle;
+ imp->imp_dlm_handle = conn;
rc = ptlrpc_init_import(imp);
if (rc != 0)
GOTO(out_ldlm, rc);
- rc = sptlrpc_import_get_sec(imp, NULL, cli->cl_sec_conf.sfc_rpc_flavor,
- cli->cl_sec_conf.sfc_flags);
- if (rc)
- GOTO(out_ldlm, rc);
-
ocd = &imp->imp_connect_data;
if (data) {
*ocd = *data;
LASSERT (imp->imp_state == LUSTRE_IMP_DISCON);
GOTO(out_ldlm, rc);
}
- LASSERT(exp->exp_connection);
+ LASSERT((*exp)->exp_connection);
if (data) {
- LASSERT((ocd->ocd_connect_flags & data->ocd_connect_flags) ==
- ocd->ocd_connect_flags);
+ LASSERTF((ocd->ocd_connect_flags & data->ocd_connect_flags) ==
+ ocd->ocd_connect_flags, "old "LPX64", new "LPX64"\n",
+ data->ocd_connect_flags, ocd->ocd_connect_flags);
data->ocd_connect_flags = ocd->ocd_connect_flags;
}
if (rc) {
out_ldlm:
- ldlm_namespace_free_prior(obd->obd_namespace);
- to_be_freed = obd->obd_namespace;
- obd->obd_namespace = NULL;
-out_disco:
cli->cl_conn_count--;
- class_disconnect(exp);
- } else {
- class_export_put(exp);
+ class_disconnect(*exp);
+ *exp = NULL;
}
out_sem:
- mutex_up(&cli->cl_sem);
- if (to_be_freed)
- ldlm_namespace_free_post(to_be_freed, 1);
+ cfs_up_write(&cli->cl_sem);
return rc;
}
struct client_obd *cli;
struct obd_import *imp;
int rc = 0, err;
- struct ldlm_namespace *to_be_freed = NULL;
ENTRY;
if (!obd) {
cli = &obd->u.cli;
imp = cli->cl_import;
- mutex_down(&cli->cl_sem);
+ cfs_down_write(&cli->cl_sem);
+ CDEBUG(D_INFO, "disconnect %s - %d\n", obd->obd_name,
+ cli->cl_conn_count);
+
if (!cli->cl_conn_count) {
CERROR("disconnecting disconnected device (%s)\n",
obd->obd_name);
- GOTO(out_sem, rc = -EINVAL);
+ GOTO(out_disconnect, rc = -EINVAL);
}
cli->cl_conn_count--;
if (cli->cl_conn_count)
- GOTO(out_no_disconnect, rc = 0);
+ GOTO(out_disconnect, rc = 0);
/* Mark import deactivated now, so we don't try to reconnect if any
* of the cleanup RPCs fails (e.g. ldlm cancel, etc). We don't
* fully deactivate the import, or that would drop all requests. */
- spin_lock(&imp->imp_lock);
+ cfs_spin_lock(&imp->imp_lock);
imp->imp_deactive = 1;
- spin_unlock(&imp->imp_lock);
-
+ cfs_spin_unlock(&imp->imp_lock);
+
/* Some non-replayable imports (MDS's OSCs) are pinged, so just
* delete it regardless. (It's safe to delete an import that was
* never added.) */
ldlm_cli_cancel_unused(obd->obd_namespace, NULL,
obd->obd_force ? LDLM_FL_LOCAL_ONLY:0,
NULL);
- ldlm_namespace_free_prior(obd->obd_namespace);
- to_be_freed = obd->obd_namespace;
+ ldlm_namespace_free_prior(obd->obd_namespace, imp, obd->obd_force);
}
+ /*
+ * there's no need to hold sem during disconnecting an import,
+ * and actually it may cause deadlock in gss.
+ */
+ cfs_up_write(&cli->cl_sem);
rc = ptlrpc_disconnect_import(imp, 0);
+ cfs_down_write(&cli->cl_sem);
ptlrpc_invalidate_import(imp);
- /* set obd_namespace to NULL only after invalidate, because we can have
- * some connect requests in flight, and his need store a connect flags
- * in obd_namespace. bug 14260 */
- obd->obd_namespace = NULL;
- ptlrpc_free_rq_pool(imp->imp_rq_pool);
- destroy_import(imp);
+ if (imp->imp_rq_pool) {
+ ptlrpc_free_rq_pool(imp->imp_rq_pool);
+ imp->imp_rq_pool = NULL;
+ }
+ client_destroy_import(imp);
cli->cl_import = NULL;
EXIT;
- out_no_disconnect:
+
+ out_disconnect:
+ /* use server style - class_disconnect should be always called for
+ * o_disconnect */
err = class_disconnect(exp);
if (!rc && err)
rc = err;
- out_sem:
- mutex_up(&cli->cl_sem);
- if (to_be_freed)
- ldlm_namespace_free_post(to_be_freed, obd->obd_force);
+
+ cfs_up_write(&cli->cl_sem);
+
+ RETURN(rc);
+}
+
+int server_disconnect_export(struct obd_export *exp)
+{
+ int rc;
+ ENTRY;
+
+ /* Disconnect early so that clients can't keep using export */
+ rc = class_disconnect(exp);
+ /* close import for avoid sending any requests */
+ if (exp->exp_imp_reverse)
+ ptlrpc_cleanup_imp(exp->exp_imp_reverse);
+
+ if (exp->exp_obd->obd_namespace != NULL)
+ ldlm_cancel_locks_for_export(exp);
+
+ /* complete all outstanding replies */
+ cfs_spin_lock(&exp->exp_lock);
+ while (!cfs_list_empty(&exp->exp_outstanding_replies)) {
+ struct ptlrpc_reply_state *rs =
+ cfs_list_entry(exp->exp_outstanding_replies.next,
+ struct ptlrpc_reply_state, rs_exp_list);
+ struct ptlrpc_service *svc = rs->rs_service;
+
+ cfs_spin_lock(&svc->srv_lock);
+ cfs_list_del_init(&rs->rs_exp_list);
+ cfs_spin_lock(&rs->rs_lock);
+ ptlrpc_schedule_difficult_reply(rs);
+ cfs_spin_unlock(&rs->rs_lock);
+ cfs_spin_unlock(&svc->srv_lock);
+ }
+ cfs_spin_unlock(&exp->exp_lock);
+
+ /* release nid stat refererence */
+ lprocfs_exp_cleanup(exp);
RETURN(rc);
}
* from old lib/target.c
* -------------------------------------------------------------------------- */
-int target_handle_reconnect(struct lustre_handle *conn, struct obd_export *exp,
- struct obd_uuid *cluuid, int initial_conn)
+static int target_handle_reconnect(struct lustre_handle *conn,
+ struct obd_export *exp,
+ struct obd_uuid *cluuid)
{
ENTRY;
- if (exp->exp_connection && exp->exp_imp_reverse && !initial_conn) {
+ if (exp->exp_connection && exp->exp_imp_reverse) {
struct lustre_handle *hdl;
hdl = &exp->exp_imp_reverse->imp_remote_handle;
/* Might be a re-connect after a partition. */
CDEBUG(D_RPCTRACE, "%s: committing for initial connect of %s\n",
obd->obd_name, exp->exp_client_uuid.uuid);
- spin_lock(&exp->exp_lock);
+ cfs_spin_lock(&exp->exp_lock);
exp->exp_need_sync = 0;
- spin_unlock(&exp->exp_lock);
+ cfs_spin_unlock(&exp->exp_lock);
+ class_export_cb_put(exp);
}
EXPORT_SYMBOL(target_client_add_cb);
+static void
+target_start_and_reset_recovery_timer(struct obd_device *obd,
+ struct ptlrpc_request *req,
+ int new_client);
+
int target_handle_connect(struct ptlrpc_request *req)
{
struct obd_device *target, *targref = NULL;
struct obd_export *export = NULL;
struct obd_import *revimp;
struct lustre_handle conn;
+ struct lustre_handle *tmp;
struct obd_uuid tgtuuid;
struct obd_uuid cluuid;
struct obd_uuid remote_uuid;
- char *str, *tmp;
+ char *str;
int rc = 0;
- int initial_conn = 0;
- struct obd_connect_data *data;
- int size[2] = { sizeof(struct ptlrpc_body), sizeof(*data) };
+ int mds_conn = 0;
+ struct obd_connect_data *data, *tmpdata;
+ lnet_nid_t *client_nid = NULL;
ENTRY;
OBD_RACE(OBD_FAIL_TGT_CONN_RACE);
- lustre_set_req_swabbed(req, REQ_REC_OFF);
- str = lustre_msg_string(req->rq_reqmsg, REQ_REC_OFF, sizeof(tgtuuid)-1);
+ str = req_capsule_client_get(&req->rq_pill, &RMF_TGTUUID);
if (str == NULL) {
DEBUG_REQ(D_ERROR, req, "bad target UUID for connect");
GOTO(out, rc = -EINVAL);
}
- obd_str2uuid (&tgtuuid, str);
+ obd_str2uuid(&tgtuuid, str);
target = class_uuid2obd(&tgtuuid);
if (!target)
target = class_name2obd(str);
if (target->obd_no_conn) {
LCONSOLE_WARN("%s: temporarily refusing client connection "
- "from %s\n", target->obd_name,
+ "from %s\n", target->obd_name,
libcfs_nid2str(req->rq_peer.nid));
GOTO(out, rc = -EAGAIN);
}
/* Make sure the target isn't cleaned up while we're here. Yes,
there's still a race between the above check and our incref here.
Really, class_uuid2obd should take the ref. */
- targref = class_incref(target);
+ targref = class_incref(target, __FUNCTION__, cfs_current());
+
- lustre_set_req_swabbed(req, REQ_REC_OFF + 1);
- str = lustre_msg_string(req->rq_reqmsg, REQ_REC_OFF + 1,
- sizeof(cluuid) - 1);
+ str = req_capsule_client_get(&req->rq_pill, &RMF_CLUUID);
if (str == NULL) {
DEBUG_REQ(D_ERROR, req, "bad client UUID for connect");
GOTO(out, rc = -EINVAL);
}
- obd_str2uuid (&cluuid, str);
+ obd_str2uuid(&cluuid, str);
/* XXX extract a nettype and format accordingly */
switch (sizeof(lnet_nid_t)) {
LBUG();
}
- tmp = lustre_msg_buf(req->rq_reqmsg, REQ_REC_OFF + 2, sizeof conn);
+ tmp = req_capsule_client_get(&req->rq_pill, &RMF_CONN);
if (tmp == NULL)
GOTO(out, rc = -EPROTO);
- memcpy(&conn, tmp, sizeof conn);
-
- data = lustre_swab_reqbuf(req, REQ_REC_OFF + 3, sizeof(*data),
- lustre_swab_connect);
+ conn = *tmp;
+ data = req_capsule_client_get(&req->rq_pill, &RMF_CONNECT_DATA);
if (!data)
GOTO(out, rc = -EPROTO);
- rc = lustre_pack_reply(req, 2, size, NULL);
+ rc = req_capsule_server_pack(&req->rq_pill);
if (rc)
GOTO(out, rc);
OBD_OCD_VERSION_MINOR(data->ocd_version),
OBD_OCD_VERSION_PATCH(data->ocd_version),
OBD_OCD_VERSION_FIX(data->ocd_version));
- data = lustre_msg_buf(req->rq_repmsg, REPLY_REC_OFF,
- offsetof(typeof(*data),
- ocd_version) +
- sizeof(data->ocd_version));
+ data = req_capsule_server_sized_get(&req->rq_pill,
+ &RMF_CONNECT_DATA,
+ offsetof(typeof(*data), ocd_version) +
+ sizeof(data->ocd_version));
if (data) {
data->ocd_connect_flags = OBD_CONNECT_VERSION;
data->ocd_version = LUSTRE_VERSION_CODE;
}
}
- if (lustre_msg_get_op_flags(req->rq_reqmsg) & MSG_CONNECT_INITIAL)
- initial_conn = 1;
+ if ((lustre_msg_get_op_flags(req->rq_reqmsg) & MSG_CONNECT_INITIAL) &&
+ (data->ocd_connect_flags & OBD_CONNECT_MDS))
+ mds_conn = 1;
/* lctl gets a backstage, all-access pass. */
if (obd_uuid_equals(&cluuid, &target->obd_uuid))
goto dont_check_exports;
- spin_lock(&target->obd_dev_lock);
- export = lustre_hash_get_object_by_key(target->obd_uuid_hash_body, &cluuid);
+ export = cfs_hash_lookup(target->obd_uuid_hash, &cluuid);
+ if (!export)
+ goto no_export;
- if (export != NULL && export->exp_connecting) { /* bug 9635, et. al. */
+ /* we've found an export in the hash */
+ if (export->exp_connecting) { /* bug 9635, et. al. */
CWARN("%s: exp %p already connecting\n",
export->exp_obd->obd_name, export);
class_export_put(export);
export = NULL;
rc = -EALREADY;
- } else if (export != NULL && export->exp_connection != NULL &&
- req->rq_peer.nid != export->exp_connection->c_peer.nid) {
- /* make darn sure this is coming from the same peer
- * if the UUIDs matched */
- CWARN("%s: cookie %s seen on new NID %s when "
- "existing NID %s is already connected\n",
- target->obd_name, cluuid.uuid,
- libcfs_nid2str(req->rq_peer.nid),
- libcfs_nid2str(export->exp_connection->c_peer.nid));
- class_export_put(export);
- export = NULL;
- rc = -EALREADY;
- } else if (export != NULL) {
- spin_lock(&export->exp_lock);
+ } else if (mds_conn && export->exp_connection) {
+ if (req->rq_peer.nid != export->exp_connection->c_peer.nid)
+ /* mds reconnected after failover */
+ CWARN("%s: received MDS connection from NID %s,"
+ " removing former export from NID %s\n",
+ target->obd_name, libcfs_nid2str(req->rq_peer.nid),
+ libcfs_nid2str(export->exp_connection->c_peer.nid));
+ else
+ /* new mds connection from the same nid */
+ CWARN("%s: received new MDS connection from NID %s,"
+ " removing former export from same NID\n",
+ target->obd_name, libcfs_nid2str(req->rq_peer.nid));
+ class_fail_export(export);
+ class_export_put(export);
+ export = NULL;
+ rc = 0;
+ } else if (export->exp_connection != NULL &&
+ req->rq_peer.nid != export->exp_connection->c_peer.nid &&
+ (lustre_msg_get_op_flags(req->rq_reqmsg) &
+ MSG_CONNECT_INITIAL)) {
+ /* in mds failover we have static uuid but nid can be
+ * changed*/
+ CWARN("%s: cookie %s seen on new NID %s when "
+ "existing NID %s is already connected\n",
+ target->obd_name, cluuid.uuid,
+ libcfs_nid2str(req->rq_peer.nid),
+ libcfs_nid2str(export->exp_connection->c_peer.nid));
+ rc = -EALREADY;
+ class_export_put(export);
+ export = NULL;
+ } else {
+ cfs_spin_lock(&export->exp_lock);
export->exp_connecting = 1;
- spin_unlock(&export->exp_lock);
+ cfs_spin_unlock(&export->exp_lock);
class_export_put(export);
- spin_unlock(&target->obd_dev_lock);
LASSERT(export->exp_obd == target);
- rc = target_handle_reconnect(&conn, export, &cluuid, initial_conn);
+ rc = target_handle_reconnect(&conn, export, &cluuid);
}
/* If we found an export, we already unlocked. */
if (!export) {
- spin_unlock(&target->obd_dev_lock);
+no_export:
OBD_FAIL_TIMEOUT(OBD_FAIL_TGT_DELAY_CONNECT, 2 * obd_timeout);
} else if (req->rq_export == NULL &&
- atomic_read(&export->exp_rpc_count) > 0) {
+ cfs_atomic_read(&export->exp_rpc_count) > 0) {
CWARN("%s: refuse connection from %s/%s to 0x%p/%d\n",
target->obd_name, cluuid.uuid,
libcfs_nid2str(req->rq_peer.nid),
- export, atomic_read(&export->exp_refcount));
+ export, cfs_atomic_read(&export->exp_refcount));
GOTO(out, rc = -EBUSY);
} else if (req->rq_export != NULL &&
- (atomic_read(&export->exp_rpc_count) > 1)) {
+ (cfs_atomic_read(&export->exp_rpc_count) > 1)) {
+ /* the current connect rpc has increased exp_rpc_count */
CWARN("%s: refuse reconnection from %s@%s to 0x%p/%d\n",
target->obd_name, cluuid.uuid,
libcfs_nid2str(req->rq_peer.nid),
- export, atomic_read(&export->exp_rpc_count));
+ export, cfs_atomic_read(&export->exp_rpc_count) - 1);
+ cfs_spin_lock(&export->exp_lock);
+ if (req->rq_export->exp_conn_cnt <
+ lustre_msg_get_conn_cnt(req->rq_reqmsg))
+ /* try to abort active requests */
+ req->rq_export->exp_abort_active_req = 1;
+ cfs_spin_unlock(&export->exp_lock);
GOTO(out, rc = -EBUSY);
- } else if (lustre_msg_get_conn_cnt(req->rq_reqmsg) == 1 &&
- !initial_conn) {
+ } else if (lustre_msg_get_conn_cnt(req->rq_reqmsg) == 1) {
CERROR("%s: NID %s (%s) reconnected with 1 conn_cnt; "
"cookies not random?\n", target->obd_name,
libcfs_nid2str(req->rq_peer.nid), cluuid.uuid);
GOTO(out, rc = -EALREADY);
} else {
OBD_FAIL_TIMEOUT(OBD_FAIL_TGT_DELAY_RECONNECT, 2 * obd_timeout);
- if (req->rq_export == NULL && initial_conn)
- export->exp_last_request_time =
- max(export->exp_last_request_time,
- (time_t)CURRENT_SECONDS);
}
- /* We want to handle EALREADY but *not* -EALREADY from
- * target_handle_reconnect(), return reconnection state in a flag */
- if (rc == EALREADY) {
- lustre_msg_add_op_flags(req->rq_repmsg, MSG_CONNECT_RECONNECT);
- rc = 0;
- } else if (rc) {
+ if (rc < 0) {
GOTO(out, rc);
}
- /* Tell the client if we're in recovery. */
- /* If this is the first client, start the recovery timer */
+
CWARN("%s: connection from %s@%s %st"LPU64" exp %p cur %ld last %ld\n",
target->obd_name, cluuid.uuid, libcfs_nid2str(req->rq_peer.nid),
target->obd_recovering ? "recovering/" : "", data->ocd_transno,
- export, (long)CURRENT_SECONDS,
+ export, (long)cfs_time_current_sec(),
export ? (long)export->exp_last_request_time : 0);
-
+ /* Tell the client if we're in recovery. */
if (target->obd_recovering) {
lustre_msg_add_op_flags(req->rq_repmsg, MSG_CONNECT_RECOVERING);
- target_start_recovery_timer(target);
+ /* If this is the first time a client connects,
+ reset the recovery timer */
+ if (rc == 0)
+ target_start_and_reset_recovery_timer(target, req,
+ !export);
+ }
+
+ /* We want to handle EALREADY but *not* -EALREADY from
+ * target_handle_reconnect(), return reconnection state in a flag */
+ if (rc == EALREADY) {
+ lustre_msg_add_op_flags(req->rq_repmsg, MSG_CONNECT_RECONNECT);
+ rc = 0;
+ } else {
+ LASSERT(rc == 0);
}
/* Tell the client if we support replayable requests */
if (target->obd_replayable)
lustre_msg_add_op_flags(req->rq_repmsg, MSG_CONNECT_REPLAYABLE);
+ client_nid = &req->rq_peer.nid;
if (export == NULL) {
if (target->obd_recovering) {
+ cfs_time_t t;
+
+ t = cfs_timer_deadline(&target->obd_recovery_timer);
+ t = cfs_time_sub(t, cfs_time_current());
CERROR("%s: denying connection for new client %s (%s): "
- "%d clients in recovery for %lds\n",
+ "%d clients in recovery for "CFS_TIME_T"s\n",
target->obd_name,
libcfs_nid2str(req->rq_peer.nid), cluuid.uuid,
- target->obd_recoverable_clients,
- cfs_duration_sec(cfs_time_sub(cfs_timer_deadline(&target->obd_recovery_timer),
- cfs_time_current())));
+ cfs_atomic_read(&target-> \
+ obd_lock_replay_clients),
+ cfs_duration_sec(t));
rc = -EBUSY;
} else {
dont_check_exports:
rc = obd_connect(req->rq_svc_thread->t_env,
- &conn, target, &cluuid, data);
+ &export, target, &cluuid, data,
+ client_nid);
+ if (rc == 0)
+ conn.cookie = export->exp_handle.h_cookie;
}
} else {
- rc = obd_reconnect(export, target, &cluuid, data);
+ rc = obd_reconnect(req->rq_svc_thread->t_env,
+ export, target, &cluuid, data, client_nid);
+ if (rc == 0)
+ /* prevous done via class_conn2export */
+ class_export_get(export);
}
if (rc)
GOTO(out, rc);
/* Return only the parts of obd_connect_data that we understand, so the
* client knows that we don't understand the rest. */
- if (data)
- memcpy(lustre_msg_buf(req->rq_repmsg, REPLY_REC_OFF,
- sizeof(*data)),
- data, sizeof(*data));
+ if (data) {
+ tmpdata = req_capsule_server_get(&req->rq_pill,
+ &RMF_CONNECT_DATA);
+ //data->ocd_connect_flags &= OBD_CONNECT_SUPPORTED;
+ *tmpdata = *data;
+ }
/* If all else goes well, this is our RPC return code. */
req->rq_status = 0;
lustre_msg_set_handle(req->rq_repmsg, &conn);
- /* ownership of this export ref transfers to the request AFTER we
- * drop any previous reference the request had, but we don't want
- * that to go to zero before we get our new export reference. */
- export = class_conn2export(&conn);
- if (!export) {
- DEBUG_REQ(D_ERROR, req, "Missing export!");
- GOTO(out, rc = -ENODEV);
- }
-
/* If the client and the server are the same node, we will already
* have an export that really points to the client's DLM export,
* because we have a shared handles table.
req->rq_export = export;
- spin_lock(&export->exp_lock);
- if (initial_conn) {
- lustre_msg_set_conn_cnt(req->rq_repmsg, export->exp_conn_cnt + 1);
- } else if (export->exp_conn_cnt >= lustre_msg_get_conn_cnt(req->rq_reqmsg)) {
- spin_unlock(&export->exp_lock);
+ cfs_spin_lock(&export->exp_lock);
+ if (export->exp_conn_cnt >= lustre_msg_get_conn_cnt(req->rq_reqmsg)) {
+ cfs_spin_unlock(&export->exp_lock);
CERROR("%s: %s already connected at higher conn_cnt: %d > %d\n",
cluuid.uuid, libcfs_nid2str(req->rq_peer.nid),
export->exp_conn_cnt,
GOTO(out, rc = -EALREADY);
}
+ LASSERT(lustre_msg_get_conn_cnt(req->rq_reqmsg) > 0);
export->exp_conn_cnt = lustre_msg_get_conn_cnt(req->rq_reqmsg);
+ export->exp_abort_active_req = 0;
/* request from liblustre? Don't evict it for not pinging. */
if (lustre_msg_get_op_flags(req->rq_reqmsg) & MSG_CONNECT_LIBCLIENT) {
export->exp_libclient = 1;
- spin_unlock(&export->exp_lock);
-
- spin_lock(&target->obd_dev_lock);
- list_del_init(&export->exp_obd_chain_timed);
- spin_unlock(&target->obd_dev_lock);
+ cfs_spin_unlock(&export->exp_lock);
+
+ cfs_spin_lock(&target->obd_dev_lock);
+ cfs_list_del_init(&export->exp_obd_chain_timed);
+ cfs_spin_unlock(&target->obd_dev_lock);
} else {
- spin_unlock(&export->exp_lock);
+ cfs_spin_unlock(&export->exp_lock);
+ }
+
+ if (export->exp_connection != NULL) {
+ /* Check to see if connection came from another NID */
+ if ((export->exp_connection->c_peer.nid != req->rq_peer.nid) &&
+ !cfs_hlist_unhashed(&export->exp_nid_hash))
+ cfs_hash_del(export->exp_obd->obd_nid_hash,
+ &export->exp_connection->c_peer.nid,
+ &export->exp_nid_hash);
+
+ ptlrpc_connection_put(export->exp_connection);
}
- if (export->exp_connection != NULL)
- ptlrpc_put_connection(export->exp_connection);
- export->exp_connection = ptlrpc_get_connection(req->rq_peer,
+ export->exp_connection = ptlrpc_connection_get(req->rq_peer,
req->rq_self,
&remote_uuid);
-
- spin_lock(&target->obd_dev_lock);
- /* Export might be hashed already, e.g. if this is reconnect */
- if (hlist_unhashed(&export->exp_nid_hash))
- lustre_hash_additem(export->exp_obd->obd_nid_hash_body,
- &export->exp_connection->c_peer.nid,
+ if (cfs_hlist_unhashed(&export->exp_nid_hash)) {
+ cfs_hash_add_unique(export->exp_obd->obd_nid_hash,
+ &export->exp_connection->c_peer.nid,
&export->exp_nid_hash);
- spin_unlock(&target->obd_dev_lock);
+ }
- spin_lock_bh(&target->obd_processing_task_lock);
+ cfs_spin_lock_bh(&target->obd_processing_task_lock);
if (target->obd_recovering && !export->exp_in_recovery) {
- spin_lock(&export->exp_lock);
+ cfs_spin_lock(&export->exp_lock);
export->exp_in_recovery = 1;
export->exp_req_replay_needed = 1;
- export->exp_lock_replay_needed = 1;
- spin_unlock(&export->exp_lock);
+ export->exp_lock_replay_needed = 1;
+ cfs_spin_unlock(&export->exp_lock);
+ if ((lustre_msg_get_op_flags(req->rq_reqmsg) & MSG_CONNECT_TRANSNO)
+ && (data->ocd_transno == 0))
+ CWARN("Connect with zero transno!\n");
+
if ((lustre_msg_get_op_flags(req->rq_reqmsg) & MSG_CONNECT_TRANSNO)
&& data->ocd_transno < target->obd_next_recovery_transno)
target->obd_next_recovery_transno = data->ocd_transno;
target->obd_connected_clients++;
- /* each connected client is counted as recoverable */
- target->obd_recoverable_clients++;
- atomic_inc(&target->obd_req_replay_clients);
- atomic_inc(&target->obd_lock_replay_clients);
- if (target->obd_connected_clients ==
+ cfs_atomic_inc(&target->obd_req_replay_clients);
+ cfs_atomic_inc(&target->obd_lock_replay_clients);
+ if (target->obd_connected_clients ==
target->obd_max_recoverable_clients)
- wake_up(&target->obd_next_transno_waitq);
+ cfs_waitq_signal(&target->obd_next_transno_waitq);
}
- spin_unlock_bh(&target->obd_processing_task_lock);
- memcpy(&conn,
- lustre_msg_buf(req->rq_reqmsg, REQ_REC_OFF + 2, sizeof conn),
- sizeof conn);
+ cfs_spin_unlock_bh(&target->obd_processing_task_lock);
+ tmp = req_capsule_client_get(&req->rq_pill, &RMF_CONN);
+ conn = *tmp;
if (export->exp_imp_reverse != NULL) {
/* destroyed import can be still referenced in ctxt */
- obd_set_info_async(export, strlen(KEY_REVIMP_UPD),
+ obd_set_info_async(export, sizeof(KEY_REVIMP_UPD),
KEY_REVIMP_UPD, 0, NULL, NULL);
- destroy_import(export->exp_imp_reverse);
+
+ client_destroy_import(export->exp_imp_reverse);
}
/* for the rest part, we return -ENOTCONN in case of errors
revimp->imp_dlm_fake = 1;
revimp->imp_state = LUSTRE_IMP_FULL;
- if (lustre_msg_get_op_flags(req->rq_reqmsg) & MSG_CONNECT_NEXT_VER) {
- revimp->imp_msg_magic = LUSTRE_MSG_MAGIC_V2;
- lustre_msg_add_op_flags(req->rq_repmsg, MSG_CONNECT_NEXT_VER);
- }
+ /* unknown versions will be caught in
+ * ptlrpc_handle_server_req_in->lustre_unpack_msg() */
+ revimp->imp_msg_magic = req->rq_reqmsg->lm_magic;
+
+ if ((export->exp_connect_flags & OBD_CONNECT_AT) &&
+ (revimp->imp_msg_magic != LUSTRE_MSG_MAGIC_V1))
+ revimp->imp_msghdr_flags |= MSGHDR_AT_SUPPORT;
+ else
+ revimp->imp_msghdr_flags &= ~MSGHDR_AT_SUPPORT;
- rc = sptlrpc_import_get_sec(revimp, req->rq_svc_ctx,
- req->rq_sec_flavor, 0);
+ rc = sptlrpc_import_sec_adapt(revimp, req->rq_svc_ctx, &req->rq_flvr);
if (rc) {
CERROR("Failed to get sec for reverse import: %d\n", rc);
export->exp_imp_reverse = NULL;
class_import_put(revimp);
out:
if (export) {
- spin_lock(&export->exp_lock);
+ cfs_spin_lock(&export->exp_lock);
export->exp_connecting = 0;
- spin_unlock(&export->exp_lock);
+ cfs_spin_unlock(&export->exp_lock);
}
if (targref)
- class_decref(targref);
+ class_decref(targref, __FUNCTION__, cfs_current());
if (rc)
req->rq_status = rc;
RETURN(rc);
int rc;
ENTRY;
- rc = lustre_pack_reply(req, 1, NULL, NULL);
+ rc = req_capsule_server_pack(&req->rq_pill);
if (rc)
RETURN(rc);
/* keep the rq_export around so we can send the reply */
req->rq_status = obd_disconnect(class_export_get(req->rq_export));
-
+
RETURN(0);
}
/* exports created from last_rcvd data, and "fake"
exports created by lctl don't have an import */
if (exp->exp_imp_reverse != NULL)
- destroy_import(exp->exp_imp_reverse);
+ client_destroy_import(exp->exp_imp_reverse);
- /* We cancel locks at disconnect time, but this will catch any locks
- * granted in a race with recovery-induced disconnect. */
- if (exp->exp_obd->obd_namespace != NULL)
- ldlm_cancel_locks_for_export(exp);
+ LASSERT(cfs_atomic_read(&exp->exp_locks_count) == 0);
+ LASSERT(cfs_atomic_read(&exp->exp_rpc_count) == 0);
+ LASSERT(cfs_atomic_read(&exp->exp_cb_count) == 0);
+ LASSERT(cfs_atomic_read(&exp->exp_replay_count) == 0);
}
/*
* Recovery functions
*/
+static void target_request_copy_get(struct ptlrpc_request *req)
+{
+ class_export_rpc_get(req->rq_export);
+ LASSERT(cfs_list_empty(&req->rq_list));
+ CFS_INIT_LIST_HEAD(&req->rq_replay_list);
+ /* increase refcount to keep request in queue */
+ LASSERT(cfs_atomic_read(&req->rq_refcount));
+ cfs_atomic_inc(&req->rq_refcount);
+ /** let export know it has replays to be handled */
+ cfs_atomic_inc(&req->rq_export->exp_replay_count);
+ /* release service thread while request is queued
+ * we are moving the request from active processing
+ * to waiting on the replay queue */
+ ptlrpc_server_active_request_dec(req);
+}
+
+static void target_request_copy_put(struct ptlrpc_request *req)
+{
+ LASSERT(cfs_list_empty(&req->rq_replay_list));
+ LASSERT(cfs_atomic_read(&req->rq_export->exp_replay_count) > 0);
+ cfs_atomic_dec(&req->rq_export->exp_replay_count);
+ class_export_rpc_put(req->rq_export);
+ /* ptlrpc_server_drop_request() assumes the request is active */
+ ptlrpc_server_active_request_inc(req);
+ ptlrpc_server_drop_request(req);
+}
-struct ptlrpc_request *ptlrpc_clone_req( struct ptlrpc_request *orig_req)
+static int target_exp_enqueue_req_replay(struct ptlrpc_request *req)
{
- struct ptlrpc_request *copy_req;
- struct lustre_msg *copy_reqmsg;
- struct ptlrpc_user_desc *udesc = NULL;
-
- OBD_ALLOC_PTR(copy_req);
- if (!copy_req)
- return NULL;
- OBD_ALLOC(copy_reqmsg, orig_req->rq_reqlen);
- if (!copy_reqmsg){
- OBD_FREE_PTR(copy_req);
- return NULL;
- }
-
- if (orig_req->rq_user_desc) {
- int ngroups = orig_req->rq_user_desc->pud_ngroups;
-
- OBD_ALLOC(udesc, sptlrpc_user_desc_size(ngroups));
- if (!udesc) {
- OBD_FREE(copy_reqmsg, orig_req->rq_reqlen);
- OBD_FREE_PTR(copy_req);
- return NULL;
+ __u64 transno = lustre_msg_get_transno(req->rq_reqmsg);
+ struct obd_export *exp = req->rq_export;
+ struct ptlrpc_request *reqiter;
+ int dup = 0;
+
+ LASSERT(exp);
+
+ cfs_spin_lock(&exp->exp_lock);
+ cfs_list_for_each_entry(reqiter, &exp->exp_req_replay_queue,
+ rq_replay_list) {
+ if (lustre_msg_get_transno(reqiter->rq_reqmsg) == transno) {
+ dup = 1;
+ break;
}
- memcpy(udesc, orig_req->rq_user_desc,
- sptlrpc_user_desc_size(ngroups));
}
- *copy_req = *orig_req;
- memcpy(copy_reqmsg, orig_req->rq_reqmsg, orig_req->rq_reqlen);
- copy_req->rq_reqmsg = copy_reqmsg;
- copy_req->rq_user_desc = udesc;
-
- class_export_get(copy_req->rq_export);
- CFS_INIT_LIST_HEAD(©_req->rq_list);
- sptlrpc_svc_ctx_addref(copy_req);
-
- if (copy_req->rq_reply_state) {
- /* the copied req takes over the reply state */
- orig_req->rq_reply_state = NULL;
- /* to catch further access */
- orig_req->rq_repmsg = NULL;
- orig_req->rq_replen = 0;
+ if (dup) {
+ /* we expect it with RESENT and REPLAY flags */
+ if ((lustre_msg_get_flags(req->rq_reqmsg) &
+ (MSG_RESENT | MSG_REPLAY)) != (MSG_RESENT | MSG_REPLAY))
+ CERROR("invalid flags %x of resent replay\n",
+ lustre_msg_get_flags(req->rq_reqmsg));
+ } else {
+ cfs_list_add_tail(&req->rq_replay_list,
+ &exp->exp_req_replay_queue);
}
- return copy_req;
+ cfs_spin_unlock(&exp->exp_lock);
+ return dup;
}
-void ptlrpc_free_clone( struct ptlrpc_request *req)
+static void target_exp_dequeue_req_replay(struct ptlrpc_request *req)
{
- if (req->rq_reply_state) {
- ptlrpc_rs_decref(req->rq_reply_state);
- req->rq_reply_state = NULL;
- }
-
- sptlrpc_svc_ctx_decref(req);
- class_export_put(req->rq_export);
- list_del(&req->rq_list);
+ LASSERT(!cfs_list_empty(&req->rq_replay_list));
+ LASSERT(req->rq_export);
- if (req->rq_user_desc) {
- int ngroups = req->rq_user_desc->pud_ngroups;
- OBD_FREE(req->rq_user_desc, sptlrpc_user_desc_size(ngroups));
- }
- OBD_FREE(req->rq_reqmsg, req->rq_reqlen);
- OBD_FREE_PTR(req);
+ cfs_spin_lock(&req->rq_export->exp_lock);
+ cfs_list_del_init(&req->rq_replay_list);
+ cfs_spin_unlock(&req->rq_export->exp_lock);
}
#ifdef __KERNEL__
obd->obd_name);
ldlm_reprocess_all_ns(obd->obd_namespace);
+ cfs_spin_lock_bh(&obd->obd_processing_task_lock);
+ if (!cfs_list_empty(&obd->obd_req_replay_queue) ||
+ !cfs_list_empty(&obd->obd_lock_replay_queue) ||
+ !cfs_list_empty(&obd->obd_final_req_queue)) {
+ CERROR("%s: Recovery queues ( %s%s%s) are not empty\n",
+ obd->obd_name,
+ cfs_list_empty(&obd->obd_req_replay_queue) ? "" : "req ",
+ cfs_list_empty(&obd->obd_lock_replay_queue) ? \
+ "" : "lock ",
+ cfs_list_empty(&obd->obd_final_req_queue) ? \
+ "" : "final ");
+ cfs_spin_unlock_bh(&obd->obd_processing_task_lock);
+ LBUG();
+ }
+ cfs_spin_unlock_bh(&obd->obd_processing_task_lock);
+
+ obd->obd_recovery_end = cfs_time_current_sec();
/* when recovery finished, cleanup orphans on mds and ost */
if (OBT(obd) && OBP(obd, postrecov)) {
int rc = OBP(obd, postrecov)(obd);
- LCONSOLE_WARN("%s: recovery %s: rc %d\n", obd->obd_name,
- rc < 0 ? "failed" : "complete", rc);
+ if (rc < 0)
+ LCONSOLE_WARN("%s: Post recovery failed, rc %d\n",
+ obd->obd_name, rc);
}
-
- obd->obd_recovery_end = CURRENT_SECONDS;
EXIT;
}
static void abort_req_replay_queue(struct obd_device *obd)
{
struct ptlrpc_request *req, *n;
+ cfs_list_t abort_list;
- list_for_each_entry_safe(req, n, &obd->obd_req_replay_queue, rq_list) {
+ CFS_INIT_LIST_HEAD(&abort_list);
+ cfs_spin_lock_bh(&obd->obd_processing_task_lock);
+ cfs_list_splice_init(&obd->obd_req_replay_queue, &abort_list);
+ cfs_spin_unlock_bh(&obd->obd_processing_task_lock);
+ cfs_list_for_each_entry_safe(req, n, &abort_list, rq_list) {
DEBUG_REQ(D_WARNING, req, "aborted:");
req->rq_status = -ENOTCONN;
if (ptlrpc_error(req)) {
DEBUG_REQ(D_ERROR, req,
"failed abort_req_reply; skipping");
}
- ptlrpc_free_clone(req);
+ target_exp_dequeue_req_replay(req);
+ target_request_copy_put(req);
}
}
static void abort_lock_replay_queue(struct obd_device *obd)
{
struct ptlrpc_request *req, *n;
+ cfs_list_t abort_list;
- list_for_each_entry_safe(req, n, &obd->obd_lock_replay_queue, rq_list){
+ CFS_INIT_LIST_HEAD(&abort_list);
+ cfs_spin_lock_bh(&obd->obd_processing_task_lock);
+ cfs_list_splice_init(&obd->obd_lock_replay_queue, &abort_list);
+ cfs_spin_unlock_bh(&obd->obd_processing_task_lock);
+ cfs_list_for_each_entry_safe(req, n, &abort_list, rq_list){
DEBUG_REQ(D_ERROR, req, "aborted:");
req->rq_status = -ENOTCONN;
- if (ptlrpc_error(req)) {
+ if (ptlrpc_error(req)) {
DEBUG_REQ(D_ERROR, req,
"failed abort_lock_reply; skipping");
}
- ptlrpc_free_clone(req);
+ target_request_copy_put(req);
}
}
#endif
void target_cleanup_recovery(struct obd_device *obd)
{
struct ptlrpc_request *req, *n;
+ cfs_list_t clean_list;
ENTRY;
- LASSERT(obd->obd_stopping);
-
- spin_lock_bh(&obd->obd_processing_task_lock);
+ CFS_INIT_LIST_HEAD(&clean_list);
+ cfs_spin_lock_bh(&obd->obd_processing_task_lock);
if (!obd->obd_recovering) {
- spin_unlock_bh(&obd->obd_processing_task_lock);
+ cfs_spin_unlock_bh(&obd->obd_processing_task_lock);
EXIT;
return;
}
obd->obd_recovering = obd->obd_abort_recovery = 0;
target_cancel_recovery_timer(obd);
- spin_unlock_bh(&obd->obd_processing_task_lock);
- list_for_each_entry_safe(req, n, &obd->obd_req_replay_queue, rq_list) {
- LASSERT (req->rq_reply_state == 0);
- ptlrpc_free_clone(req);
- }
- list_for_each_entry_safe(req, n, &obd->obd_lock_replay_queue, rq_list){
- LASSERT (req->rq_reply_state == 0);
- ptlrpc_free_clone(req);
+ cfs_list_splice_init(&obd->obd_req_replay_queue, &clean_list);
+ cfs_spin_unlock_bh(&obd->obd_processing_task_lock);
+
+ cfs_list_for_each_entry_safe(req, n, &clean_list, rq_list) {
+ LASSERT(req->rq_reply_state == 0);
+ target_exp_dequeue_req_replay(req);
+ target_request_copy_put(req);
}
- list_for_each_entry_safe(req, n, &obd->obd_final_req_queue, rq_list) {
- LASSERT (req->rq_reply_state == 0);
- ptlrpc_free_clone(req);
+
+ cfs_spin_lock_bh(&obd->obd_processing_task_lock);
+ cfs_list_splice_init(&obd->obd_lock_replay_queue, &clean_list);
+ cfs_list_splice_init(&obd->obd_final_req_queue, &clean_list);
+ cfs_spin_unlock_bh(&obd->obd_processing_task_lock);
+
+ cfs_list_for_each_entry_safe(req, n, &clean_list, rq_list){
+ LASSERT(req->rq_reply_state == 0);
+ target_request_copy_put(req);
}
EXIT;
}
-static void target_recovery_expired(unsigned long castmeharder)
-{
- struct obd_device *obd = (struct obd_device *)castmeharder;
- CERROR("%s: recovery timed out, aborting\n", obd->obd_name);
- spin_lock_bh(&obd->obd_processing_task_lock);
- if (obd->obd_recovering)
- obd->obd_abort_recovery = 1;
- cfs_waitq_signal(&obd->obd_next_transno_waitq);
- spin_unlock_bh(&obd->obd_processing_task_lock);
-}
-
-
/* obd_processing_task_lock should be held */
void target_cancel_recovery_timer(struct obd_device *obd)
{
cfs_timer_disarm(&obd->obd_recovery_timer);
}
-static void reset_recovery_timer(struct obd_device *obd)
+/* extend = 1 means require at least "duration" seconds left in the timer,
+ extend = 0 means set the total duration (start_recovery_timer) */
+static void reset_recovery_timer(struct obd_device *obd, int duration,
+ int extend)
{
- spin_lock_bh(&obd->obd_processing_task_lock);
- if (!obd->obd_recovering) {
- spin_unlock_bh(&obd->obd_processing_task_lock);
+ cfs_time_t now = cfs_time_current_sec();
+ cfs_duration_t left;
+
+ cfs_spin_lock_bh(&obd->obd_processing_task_lock);
+ if (!obd->obd_recovering || obd->obd_abort_recovery) {
+ cfs_spin_unlock_bh(&obd->obd_processing_task_lock);
return;
}
- cfs_timer_arm(&obd->obd_recovery_timer,
- cfs_time_shift(OBD_RECOVERY_TIMEOUT));
- spin_unlock_bh(&obd->obd_processing_task_lock);
- CDEBUG(D_HA, "%s: timer will expire in %u seconds\n", obd->obd_name,
- OBD_RECOVERY_TIMEOUT);
- /* Only used for lprocfs_status */
- obd->obd_recovery_end = CURRENT_SECONDS + OBD_RECOVERY_TIMEOUT;
-}
+ left = cfs_time_sub(obd->obd_recovery_end, now);
+
+ if (extend && (duration > left))
+ obd->obd_recovery_timeout += duration - left;
+ else if (!extend && (duration > obd->obd_recovery_timeout))
+ /* Track the client's largest expected replay time */
+ obd->obd_recovery_timeout = duration;
+#ifdef CRAY_XT3
+ /*
+ * If total recovery time already exceed the
+ * obd_recovery_max_time, then CRAY XT3 will
+ * abort the recovery
+ */
+ if(obd->obd_recovery_timeout > obd->obd_recovery_max_time)
+ obd->obd_recovery_timeout = obd->obd_recovery_max_time;
+#endif
+ obd->obd_recovery_end = obd->obd_recovery_start +
+ obd->obd_recovery_timeout;
+ if (!cfs_timer_is_armed(&obd->obd_recovery_timer) ||
+ cfs_time_before(now, obd->obd_recovery_end)) {
+ left = cfs_time_sub(obd->obd_recovery_end, now);
+ cfs_timer_arm(&obd->obd_recovery_timer, cfs_time_shift(left));
+ }
+ cfs_spin_unlock_bh(&obd->obd_processing_task_lock);
+ CDEBUG(D_HA, "%s: recovery timer will expire in %u seconds\n",
+ obd->obd_name, (unsigned)left);
+}
-/* Only start it the first time called */
-void target_start_recovery_timer(struct obd_device *obd)
+static void check_and_start_recovery_timer(struct obd_device *obd)
{
- spin_lock_bh(&obd->obd_processing_task_lock);
- if (obd->obd_recovery_handler
- || timer_pending((struct timer_list *)&obd->obd_recovery_timer)) {
- spin_unlock_bh(&obd->obd_processing_task_lock);
+ cfs_spin_lock_bh(&obd->obd_processing_task_lock);
+ if (cfs_timer_is_armed(&obd->obd_recovery_timer)) {
+ cfs_spin_unlock_bh(&obd->obd_processing_task_lock);
return;
}
- CWARN("%s: starting recovery timer (%us)\n", obd->obd_name,
- OBD_RECOVERY_TIMEOUT);
- cfs_timer_init(&obd->obd_recovery_timer, target_recovery_expired, obd);
- spin_unlock_bh(&obd->obd_processing_task_lock);
+ CDEBUG(D_HA, "%s: starting recovery timer\n", obd->obd_name);
+ obd->obd_recovery_start = cfs_time_current_sec();
+ /* minimum */
+ obd->obd_recovery_timeout = OBD_RECOVERY_FACTOR * obd_timeout;
+ cfs_spin_unlock_bh(&obd->obd_processing_task_lock);
+
+ reset_recovery_timer(obd, obd->obd_recovery_timeout, 0);
+}
+
+/* Reset the timer with each new client connection */
+/*
+ * This timer is actually reconnect_timer, which is for making sure
+ * the total recovery window is at least as big as my reconnect
+ * attempt timing. So the initial recovery time_out will be set to
+ * OBD_RECOVERY_FACTOR * obd_timeout. If the timeout coming
+ * from client is bigger than this, then the recovery time_out will
+ * be extended to make sure the client could be reconnected, in the
+ * process, the timeout from the new client should be ignored.
+ */
- reset_recovery_timer(obd);
+static void
+target_start_and_reset_recovery_timer(struct obd_device *obd,
+ struct ptlrpc_request *req,
+ int new_client)
+{
+ int service_time = lustre_msg_get_service_time(req->rq_reqmsg);
+
+ if (!new_client && service_time)
+ /* Teach server about old server's estimates, as first guess
+ * at how long new requests will take. */
+ at_measured(&req->rq_rqbd->rqbd_service->srv_at_estimate,
+ service_time);
+
+ check_and_start_recovery_timer(obd);
+
+ /* convert the service time to rpc timeout,
+ * reuse service_time to limit stack usage */
+ service_time = at_est2timeout(service_time);
+
+ /* 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 */
+ service_time += 2 * (CONNECTION_SWITCH_MAX + CONNECTION_SWITCH_INC +
+ INITIAL_CONNECT_TIMEOUT);
+ if (service_time > obd->obd_recovery_timeout && !new_client)
+ reset_recovery_timer(obd, service_time, 0);
}
#ifdef __KERNEL__
+
+/** Health checking routines */
+static inline int exp_connect_healthy(struct obd_export *exp)
+{
+ return (exp->exp_in_recovery);
+}
+
+/** if export done req_replay or has replay in queue */
+static inline int exp_req_replay_healthy(struct obd_export *exp)
+{
+ return (!exp->exp_req_replay_needed ||
+ cfs_atomic_read(&exp->exp_replay_count) > 0);
+}
+/** if export done lock_replay or has replay in queue */
+static inline int exp_lock_replay_healthy(struct obd_export *exp)
+{
+ return (!exp->exp_lock_replay_needed ||
+ cfs_atomic_read(&exp->exp_replay_count) > 0);
+}
+
+static inline int exp_vbr_healthy(struct obd_export *exp)
+{
+ return (!exp->exp_vbr_failed);
+}
+
+static inline int exp_finished(struct obd_export *exp)
+{
+ return (exp->exp_in_recovery && !exp->exp_lock_replay_needed);
+}
+
+/** Checking routines for recovery */
+static int check_for_clients(struct obd_device *obd)
+{
+ if (obd->obd_abort_recovery || obd->obd_recovery_expired)
+ return 1;
+ LASSERT(obd->obd_connected_clients <= obd->obd_max_recoverable_clients);
+ if (obd->obd_no_conn == 0 &&
+ obd->obd_connected_clients + obd->obd_stale_clients ==
+ obd->obd_max_recoverable_clients)
+ return 1;
+ return 0;
+}
+
static int check_for_next_transno(struct obd_device *obd)
{
struct ptlrpc_request *req = NULL;
- int wake_up = 0, connected, completed, queue_len, max;
+ int wake_up = 0, connected, completed, queue_len;
__u64 next_transno, req_transno;
ENTRY;
- spin_lock_bh(&obd->obd_processing_task_lock);
+ cfs_spin_lock_bh(&obd->obd_processing_task_lock);
- if (!list_empty(&obd->obd_req_replay_queue)) {
- req = list_entry(obd->obd_req_replay_queue.next,
- struct ptlrpc_request, rq_list);
+ if (!cfs_list_empty(&obd->obd_req_replay_queue)) {
+ req = cfs_list_entry(obd->obd_req_replay_queue.next,
+ struct ptlrpc_request, rq_list);
req_transno = lustre_msg_get_transno(req->rq_reqmsg);
} else {
req_transno = 0;
}
- max = obd->obd_max_recoverable_clients;
connected = obd->obd_connected_clients;
- completed = connected - obd->obd_recoverable_clients;
+ completed = connected - cfs_atomic_read(&obd->obd_req_replay_clients);
queue_len = obd->obd_requests_queued_for_recovery;
next_transno = obd->obd_next_recovery_transno;
CDEBUG(D_HA, "max: %d, connected: %d, completed: %d, queue_len: %d, "
"req_transno: "LPU64", next_transno: "LPU64"\n",
- max, connected, completed, queue_len, req_transno, next_transno);
+ obd->obd_max_recoverable_clients, connected, completed,
+ queue_len, req_transno, next_transno);
if (obd->obd_abort_recovery) {
CDEBUG(D_HA, "waking for aborted recovery\n");
wake_up = 1;
- } else if (atomic_read(&obd->obd_req_replay_clients) == 0) {
+ } else if (obd->obd_recovery_expired) {
+ CDEBUG(D_HA, "waking for expired recovery\n");
+ wake_up = 1;
+ } else if (cfs_atomic_read(&obd->obd_req_replay_clients) == 0) {
CDEBUG(D_HA, "waking for completed recovery\n");
wake_up = 1;
} else if (req_transno == next_transno) {
CDEBUG(D_HA, "waking for next ("LPD64")\n", next_transno);
wake_up = 1;
- } else if (queue_len + completed == max) {
- /* handle gaps occured due to lost reply. It is allowed gaps
- * because all clients are connected and there will be resend
- * for missed transaction */
+ } else if (queue_len == cfs_atomic_read(&obd->obd_req_replay_clients)) {
+ int d_lvl = D_HA;
+ /** handle gaps occured due to lost reply or VBR */
LASSERTF(req_transno >= next_transno,
"req_transno: "LPU64", next_transno: "LPU64"\n",
req_transno, next_transno);
-
- CDEBUG(req_transno > obd->obd_last_committed ? D_ERROR : D_HA,
- "waking for skipped transno (skip: "LPD64
- ", ql: %d, comp: %d, conn: %d, next: "LPD64")\n",
- next_transno, queue_len, completed, connected, req_transno);
+ if (req_transno > obd->obd_last_committed &&
+ !obd->obd_version_recov)
+ d_lvl = D_ERROR;
+ CDEBUG(d_lvl,
+ "%s: waking for gap in transno, VBR is %s (skip: "
+ LPD64", ql: %d, comp: %d, conn: %d, next: "LPD64
+ ", last_committed: "LPD64")\n",
+ obd->obd_name, obd->obd_version_recov ? "ON" : "OFF",
+ next_transno, queue_len, completed, connected,
+ req_transno, obd->obd_last_committed);
obd->obd_next_recovery_transno = req_transno;
wake_up = 1;
- } else if (queue_len == atomic_read(&obd->obd_req_replay_clients)) {
- /* some clients haven't connected in time, but we can try
- * to replay requests that demand on already committed ones
- * also, we can replay first non-committed transation */
- LASSERT(req_transno != 0);
- if (req_transno == obd->obd_last_committed + 1) {
- obd->obd_next_recovery_transno = req_transno;
- } else if (req_transno > obd->obd_last_committed) {
- /* can't continue recovery: have no needed transno */
- obd->obd_abort_recovery = 1;
- CDEBUG(D_ERROR, "abort due to missed clients. max: %d, "
- "connected: %d, completed: %d, queue_len: %d, "
- "req_transno: "LPU64", next_transno: "LPU64"\n",
- max, connected, completed, queue_len,
- req_transno, next_transno);
- }
+ } else if (OBD_FAIL_CHECK(OBD_FAIL_MDS_RECOVERY_ACCEPTS_GAPS)) {
+ CDEBUG(D_HA, "accepting transno gaps is explicitly allowed"
+ " by fail_lock, waking up ("LPD64")\n", next_transno);
+ obd->obd_next_recovery_transno = req_transno;
wake_up = 1;
}
-
- spin_unlock_bh(&obd->obd_processing_task_lock);
+ cfs_spin_unlock_bh(&obd->obd_processing_task_lock);
return wake_up;
}
-static struct ptlrpc_request *target_next_replay_req(struct obd_device *obd)
-{
- struct l_wait_info lwi = { 0 };
- struct ptlrpc_request *req;
-
- CDEBUG(D_HA, "Waiting for transno "LPD64"\n",
- obd->obd_next_recovery_transno);
- l_wait_event(obd->obd_next_transno_waitq,
- check_for_next_transno(obd), &lwi);
-
- spin_lock_bh(&obd->obd_processing_task_lock);
- if (obd->obd_abort_recovery) {
- req = NULL;
- } else if (!list_empty(&obd->obd_req_replay_queue)) {
- req = list_entry(obd->obd_req_replay_queue.next,
- struct ptlrpc_request, rq_list);
- list_del_init(&req->rq_list);
- obd->obd_requests_queued_for_recovery--;
- } else {
- req = NULL;
- }
- spin_unlock_bh(&obd->obd_processing_task_lock);
- RETURN(req);
-}
-
static int check_for_next_lock(struct obd_device *obd)
{
- struct ptlrpc_request *req = NULL;
int wake_up = 0;
- spin_lock_bh(&obd->obd_processing_task_lock);
- if (!list_empty(&obd->obd_lock_replay_queue)) {
- req = list_entry(obd->obd_lock_replay_queue.next,
- struct ptlrpc_request, rq_list);
+ cfs_spin_lock_bh(&obd->obd_processing_task_lock);
+ if (!cfs_list_empty(&obd->obd_lock_replay_queue)) {
CDEBUG(D_HA, "waking for next lock\n");
wake_up = 1;
- } else if (atomic_read(&obd->obd_lock_replay_clients) == 0) {
+ } else if (cfs_atomic_read(&obd->obd_lock_replay_clients) == 0) {
CDEBUG(D_HA, "waking for completed lock replay\n");
wake_up = 1;
} else if (obd->obd_abort_recovery) {
CDEBUG(D_HA, "waking for aborted recovery\n");
wake_up = 1;
+ } else if (obd->obd_recovery_expired) {
+ CDEBUG(D_HA, "waking for expired recovery\n");
+ wake_up = 1;
}
- spin_unlock_bh(&obd->obd_processing_task_lock);
+ cfs_spin_unlock_bh(&obd->obd_processing_task_lock);
return wake_up;
}
-static struct ptlrpc_request *target_next_replay_lock(struct obd_device *obd)
+/**
+ * wait for recovery events,
+ * check its status with help of check_routine
+ * evict dead clients via health_check
+ */
+static int target_recovery_overseer(struct obd_device *obd,
+ int (*check_routine)(struct obd_device *),
+ int (*health_check)(struct obd_export *))
{
- struct l_wait_info lwi = { 0 };
- struct ptlrpc_request *req;
-
- CDEBUG(D_HA, "Waiting for lock\n");
- l_wait_event(obd->obd_next_transno_waitq,
- check_for_next_lock(obd), &lwi);
+ int abort = 0, expired = 1;
+
+ do {
+ cfs_wait_event(obd->obd_next_transno_waitq, check_routine(obd));
+ cfs_spin_lock_bh(&obd->obd_processing_task_lock);
+ abort = obd->obd_abort_recovery;
+ expired = obd->obd_recovery_expired;
+ obd->obd_recovery_expired = 0;
+ cfs_spin_unlock_bh(&obd->obd_processing_task_lock);
+ if (abort) {
+ CWARN("recovery is aborted, evict exports in recovery\n");
+ /** evict exports which didn't finish recovery yet */
+ class_disconnect_stale_exports(obd, exp_finished);
+ } else if (expired) {
+ /** If some clients died being recovered, evict them */
+ CDEBUG(D_WARNING, "recovery is timed out, evict stale exports\n");
+ /** evict cexports with no replay in queue, they are stalled */
+ class_disconnect_stale_exports(obd, health_check);
+ /** continue with VBR */
+ cfs_spin_lock_bh(&obd->obd_processing_task_lock);
+ obd->obd_version_recov = 1;
+ cfs_spin_unlock_bh(&obd->obd_processing_task_lock);
+ /**
+ * reset timer, recovery will proceed with versions now,
+ * timeout is set just to handle reconnection delays
+ */
+ reset_recovery_timer(obd, RECONNECT_DELAY_MAX, 1);
+ /** Wait for recovery events again, after evicting bad clients */
+ }
+ } while (!abort && expired);
- spin_lock_bh(&obd->obd_processing_task_lock);
- if (obd->obd_abort_recovery) {
- req = NULL;
- } else if (!list_empty(&obd->obd_lock_replay_queue)) {
- req = list_entry(obd->obd_lock_replay_queue.next,
- struct ptlrpc_request, rq_list);
- list_del_init(&req->rq_list);
- } else {
- req = NULL;
- }
- spin_unlock_bh(&obd->obd_processing_task_lock);
- return req;
+ return abort;
}
-static struct ptlrpc_request *target_next_final_ping(struct obd_device *obd)
+static struct ptlrpc_request *target_next_replay_req(struct obd_device *obd)
{
- struct ptlrpc_request *req;
+ struct ptlrpc_request *req = NULL;
+ ENTRY;
+
+ CDEBUG(D_HA, "Waiting for transno "LPD64"\n",
+ obd->obd_next_recovery_transno);
+
+ if (target_recovery_overseer(obd, check_for_next_transno,
+ exp_req_replay_healthy)) {
+ abort_req_replay_queue(obd);
+ abort_lock_replay_queue(obd);
+ }
- spin_lock_bh(&obd->obd_processing_task_lock);
- if (!list_empty(&obd->obd_final_req_queue)) {
- req = list_entry(obd->obd_final_req_queue.next,
- struct ptlrpc_request, rq_list);
- list_del_init(&req->rq_list);
+ cfs_spin_lock_bh(&obd->obd_processing_task_lock);
+ if (!cfs_list_empty(&obd->obd_req_replay_queue)) {
+ req = cfs_list_entry(obd->obd_req_replay_queue.next,
+ struct ptlrpc_request, rq_list);
+ cfs_list_del_init(&req->rq_list);
+ obd->obd_requests_queued_for_recovery--;
+ cfs_spin_unlock_bh(&obd->obd_processing_task_lock);
} else {
- req = NULL;
+ cfs_spin_unlock_bh(&obd->obd_processing_task_lock);
+ LASSERT(cfs_list_empty(&obd->obd_req_replay_queue));
+ LASSERT(cfs_atomic_read(&obd->obd_req_replay_clients) == 0);
+ /** evict exports failed VBR */
+ class_disconnect_stale_exports(obd, exp_vbr_healthy);
}
- spin_unlock_bh(&obd->obd_processing_task_lock);
- return req;
+ RETURN(req);
}
-static inline int req_replay_done(struct obd_export *exp)
+static struct ptlrpc_request *target_next_replay_lock(struct obd_device *obd)
{
- return (exp->exp_req_replay_needed == 0);
-}
+ struct ptlrpc_request *req = NULL;
-static inline int lock_replay_done(struct obd_export *exp)
-{
- return (exp->exp_lock_replay_needed == 0);
-}
+ CDEBUG(D_HA, "Waiting for lock\n");
+ if (target_recovery_overseer(obd, check_for_next_lock,
+ exp_lock_replay_healthy))
+ abort_lock_replay_queue(obd);
-static inline int connect_done(struct obd_export *exp)
-{
- return (exp->exp_in_recovery != 0);
+ cfs_spin_lock_bh(&obd->obd_processing_task_lock);
+ if (!cfs_list_empty(&obd->obd_lock_replay_queue)) {
+ req = cfs_list_entry(obd->obd_lock_replay_queue.next,
+ struct ptlrpc_request, rq_list);
+ cfs_list_del_init(&req->rq_list);
+ cfs_spin_unlock_bh(&obd->obd_processing_task_lock);
+ } else {
+ cfs_spin_unlock_bh(&obd->obd_processing_task_lock);
+ LASSERT(cfs_list_empty(&obd->obd_lock_replay_queue));
+ LASSERT(cfs_atomic_read(&obd->obd_lock_replay_clients) == 0);
+ /** evict exports failed VBR */
+ class_disconnect_stale_exports(obd, exp_vbr_healthy);
+ }
+ return req;
}
-static int check_for_clients(struct obd_device *obd)
+static struct ptlrpc_request *target_next_final_ping(struct obd_device *obd)
{
- if (obd->obd_abort_recovery)
- return 1;
- LASSERT(obd->obd_connected_clients <= obd->obd_max_recoverable_clients);
- if (obd->obd_no_conn == 0 &&
- obd->obd_connected_clients == obd->obd_max_recoverable_clients)
- return 1;
- return 0;
+ struct ptlrpc_request *req = NULL;
+
+ cfs_spin_lock_bh(&obd->obd_processing_task_lock);
+ if (!cfs_list_empty(&obd->obd_final_req_queue)) {
+ req = cfs_list_entry(obd->obd_final_req_queue.next,
+ struct ptlrpc_request, rq_list);
+ cfs_list_del_init(&req->rq_list);
+ if (req->rq_export->exp_in_recovery) {
+ cfs_spin_lock(&req->rq_export->exp_lock);
+ req->rq_export->exp_in_recovery = 0;
+ cfs_spin_unlock(&req->rq_export->exp_lock);
+ }
+ }
+ cfs_spin_unlock_bh(&obd->obd_processing_task_lock);
+ return req;
}
static int handle_recovery_req(struct ptlrpc_thread *thread,
int rc;
ENTRY;
- rc = lu_context_init(&req->rq_session, LCT_SESSION);
+ rc = lu_context_init(&req->rq_recov_session, LCT_SESSION);
if (rc) {
CERROR("Failure to initialize session: %d\n", rc);
- return rc;
+ GOTO(reqcopy_put, rc);
}
- req->rq_session.lc_thread = thread;
- lu_context_enter(&req->rq_session);
+ /**
+ * export can be evicted during recovery, no need to handle replays for
+ * it after that, discard such request silently
+ */
+ if (req->rq_export->exp_disconnected)
+ GOTO(reqcopy_put, rc);
+
+ req->rq_recov_session.lc_thread = thread;
+ lu_context_enter(&req->rq_recov_session);
req->rq_svc_thread = thread;
- req->rq_svc_thread->t_env->le_ses = &req->rq_session;
+ req->rq_svc_thread->t_env->le_ses = &req->rq_recov_session;
+ /* thread context */
+ lu_context_enter(&thread->t_env->le_ctx);
(void)handler(req);
+ lu_context_exit(&thread->t_env->le_ctx);
- lu_context_exit(&req->rq_session);
- lu_context_fini(&req->rq_session);
+ lu_context_exit(&req->rq_recov_session);
+ lu_context_fini(&req->rq_recov_session);
/* don't reset timer for final stage */
- if (!req_replay_done(req->rq_export) ||
- !lock_replay_done(req->rq_export))
- reset_recovery_timer(class_exp2obd(req->rq_export));
- ptlrpc_free_clone(req);
- RETURN(0);
+ if (!exp_finished(req->rq_export)) {
+ /**
+ * Add request timeout to the recovery time so next request from
+ * this client may come in recovery time
+ */
+ reset_recovery_timer(class_exp2obd(req->rq_export),
+ AT_OFF ? obd_timeout :
+ lustre_msg_get_timeout(req->rq_reqmsg), 1);
+ }
+reqcopy_put:
+ RETURN(rc);
}
static int target_recovery_thread(void *arg)
{
- struct obd_device *obd = arg;
+ struct lu_target *lut = arg;
+ struct obd_device *obd = lut->lut_obd;
struct ptlrpc_request *req;
struct target_recovery_data *trd = &obd->obd_recovery_data;
- struct l_wait_info lwi = { 0 };
unsigned long delta;
unsigned long flags;
struct lu_env env;
struct ptlrpc_thread fake_svc_thread, *thread = &fake_svc_thread;
- __u32 recov_ctx_tags = LCT_MD_THREAD;
int rc = 0;
ENTRY;
- cfs_daemonize("tgt_recov");
+ cfs_daemonize_ctxt("tgt_recov");
SIGNAL_MASK_LOCK(current, flags);
sigfillset(¤t->blocked);
RECALC_SIGPENDING;
SIGNAL_MASK_UNLOCK(current, flags);
- rc = lu_context_init(&env.le_ctx, recov_ctx_tags);
+ rc = lu_context_init(&env.le_ctx, LCT_MD_THREAD);
if (rc)
RETURN(rc);
env.le_ctx.lc_thread = thread;
CERROR("%s: started recovery thread pid %d\n", obd->obd_name,
- current->pid);
- trd->trd_processing_task = current->pid;
+ cfs_curproc_pid());
+ trd->trd_processing_task = cfs_curproc_pid();
obd->obd_recovering = 1;
- complete(&trd->trd_starting);
+ cfs_complete(&trd->trd_starting);
/* first of all, we have to know the first transno to replay */
- obd->obd_abort_recovery = 0;
- l_wait_event(obd->obd_next_transno_waitq,
- check_for_clients(obd), &lwi);
-
- spin_lock_bh(&obd->obd_processing_task_lock);
- target_cancel_recovery_timer(obd);
- spin_unlock_bh(&obd->obd_processing_task_lock);
-
- /* If some clients haven't connected in time, evict them */
- if (obd->obd_abort_recovery) {
- CWARN("Some clients haven't connect in time (%d/%d),"
- "evict them\n", obd->obd_connected_clients,
- obd->obd_max_recoverable_clients);
- obd->obd_abort_recovery = obd->obd_stopping;
- class_disconnect_stale_exports(obd, connect_done);
+ if (target_recovery_overseer(obd, check_for_clients,
+ exp_connect_healthy)) {
+ abort_req_replay_queue(obd);
+ abort_lock_replay_queue(obd);
}
+
/* next stage: replay requests */
delta = jiffies;
obd->obd_req_replaying = 1;
CDEBUG(D_INFO, "1: request replay stage - %d clients from t"LPU64"\n",
- atomic_read(&obd->obd_req_replay_clients),
- obd->obd_next_recovery_transno);
+ cfs_atomic_read(&obd->obd_req_replay_clients),
+ obd->obd_next_recovery_transno);
while ((req = target_next_replay_req(obd))) {
- LASSERT(trd->trd_processing_task == current->pid);
+ LASSERT(trd->trd_processing_task == cfs_curproc_pid());
DEBUG_REQ(D_HA, req, "processing t"LPD64" from %s",
lustre_msg_get_transno(req->rq_reqmsg),
libcfs_nid2str(req->rq_peer.nid));
-
handle_recovery_req(thread, req,
trd->trd_recovery_handler);
- obd->obd_replayed_requests++;
- spin_lock_bh(&obd->obd_processing_task_lock);
+ /**
+ * bz18031: increase next_recovery_transno before
+ * target_request_copy_put() will drop exp_rpc reference
+ */
+ cfs_spin_lock_bh(&obd->obd_processing_task_lock);
obd->obd_next_recovery_transno++;
- spin_unlock_bh(&obd->obd_processing_task_lock);
+ cfs_spin_unlock_bh(&obd->obd_processing_task_lock);
+ target_exp_dequeue_req_replay(req);
+ target_request_copy_put(req);
+ obd->obd_replayed_requests++;
}
- spin_lock_bh(&obd->obd_processing_task_lock);
- target_cancel_recovery_timer(obd);
- spin_unlock_bh(&obd->obd_processing_task_lock);
-
- /* If some clients haven't replayed requests in time, evict them */
- if (obd->obd_abort_recovery) {
- CDEBUG(D_ERROR, "req replay timed out, aborting ...\n");
- obd->obd_abort_recovery = obd->obd_stopping;
- class_disconnect_stale_exports(obd, req_replay_done);
- abort_req_replay_queue(obd);
- }
- /* The second stage: replay locks */
+ /**
+ * The second stage: replay locks
+ */
CDEBUG(D_INFO, "2: lock replay stage - %d clients\n",
- atomic_read(&obd->obd_lock_replay_clients));
+ cfs_atomic_read(&obd->obd_lock_replay_clients));
while ((req = target_next_replay_lock(obd))) {
- LASSERT(trd->trd_processing_task == current->pid);
- DEBUG_REQ(D_HA|D_WARNING, req, "processing lock from %s: ",
+ LASSERT(trd->trd_processing_task == cfs_curproc_pid());
+ DEBUG_REQ(D_HA, req, "processing lock from %s: ",
libcfs_nid2str(req->rq_peer.nid));
handle_recovery_req(thread, req,
trd->trd_recovery_handler);
+ target_request_copy_put(req);
obd->obd_replayed_locks++;
}
- spin_lock_bh(&obd->obd_processing_task_lock);
- target_cancel_recovery_timer(obd);
- spin_unlock_bh(&obd->obd_processing_task_lock);
- /* If some clients haven't replayed requests in time, evict them */
- if (obd->obd_abort_recovery) {
- int stale;
- CERROR("lock replay timed out, aborting ...\n");
- obd->obd_abort_recovery = obd->obd_stopping;
- stale = class_disconnect_stale_exports(obd, lock_replay_done);
- abort_lock_replay_queue(obd);
- }
-
+ /**
+ * The third stage: reply on final pings, at this moment all clients
+ * must have request in final queue
+ */
+ CDEBUG(D_INFO, "3: final stage - process recovery completion pings\n");
+ /** Update server last boot epoch */
+ lut_boot_epoch_update(lut);
/* We drop recoverying flag to forward all new requests
* to regular mds_handle() since now */
- spin_lock_bh(&obd->obd_processing_task_lock);
+ cfs_spin_lock_bh(&obd->obd_processing_task_lock);
obd->obd_recovering = obd->obd_abort_recovery = 0;
- spin_unlock_bh(&obd->obd_processing_task_lock);
- /* The third stage: reply on final pings */
- CDEBUG(D_INFO, "3: final stage - process recovery completion pings\n");
+ target_cancel_recovery_timer(obd);
+ cfs_spin_unlock_bh(&obd->obd_processing_task_lock);
while ((req = target_next_final_ping(obd))) {
- LASSERT(trd->trd_processing_task == current->pid);
+ LASSERT(trd->trd_processing_task == cfs_curproc_pid());
DEBUG_REQ(D_HA, req, "processing final ping from %s: ",
libcfs_nid2str(req->rq_peer.nid));
handle_recovery_req(thread, req,
trd->trd_recovery_handler);
+ target_request_copy_put(req);
}
- delta = (jiffies - delta) / HZ;
+ delta = (jiffies - delta) / CFS_HZ;
CDEBUG(D_INFO,"4: recovery completed in %lus - %d/%d reqs/locks\n",
delta, obd->obd_replayed_requests, obd->obd_replayed_locks);
- LASSERT(atomic_read(&obd->obd_req_replay_clients) == 0);
- LASSERT(atomic_read(&obd->obd_lock_replay_clients) == 0);
- if (delta > obd_timeout * 2) {
+ if (delta > obd_timeout * OBD_RECOVERY_FACTOR) {
CWARN("too long recovery - read logs\n");
libcfs_debug_dumplog();
}
target_finish_recovery(obd);
- lu_env_fini(&env);
+ lu_context_fini(&env.le_ctx);
trd->trd_processing_task = 0;
- complete(&trd->trd_finishing);
+ cfs_complete(&trd->trd_finishing);
RETURN(rc);
}
-int target_start_recovery_thread(struct obd_device *obd, svc_handler_t handler)
+static int target_start_recovery_thread(struct lu_target *lut,
+ svc_handler_t handler)
{
+ struct obd_device *obd = lut->lut_obd;
int rc = 0;
struct target_recovery_data *trd = &obd->obd_recovery_data;
memset(trd, 0, sizeof(*trd));
- init_completion(&trd->trd_starting);
- init_completion(&trd->trd_finishing);
+ cfs_init_completion(&trd->trd_starting);
+ cfs_init_completion(&trd->trd_finishing);
trd->trd_recovery_handler = handler;
- if (kernel_thread(target_recovery_thread, obd, 0) > 0) {
- wait_for_completion(&trd->trd_starting);
+ if (cfs_kernel_thread(target_recovery_thread, lut, 0) > 0) {
+ cfs_wait_for_completion(&trd->trd_starting);
LASSERT(obd->obd_recovering != 0);
} else
rc = -ECHILD;
void target_stop_recovery_thread(struct obd_device *obd)
{
- spin_lock_bh(&obd->obd_processing_task_lock);
+ cfs_spin_lock_bh(&obd->obd_processing_task_lock);
if (obd->obd_recovery_data.trd_processing_task > 0) {
struct target_recovery_data *trd = &obd->obd_recovery_data;
- CERROR("%s: Aborting recovery\n", obd->obd_name);
- obd->obd_abort_recovery = 1;
- wake_up(&obd->obd_next_transno_waitq);
- spin_unlock_bh(&obd->obd_processing_task_lock);
- wait_for_completion(&trd->trd_finishing);
+ /** recovery can be done but postrecovery is not yet */
+ if (obd->obd_recovering) {
+ CERROR("%s: Aborting recovery\n", obd->obd_name);
+ obd->obd_abort_recovery = 1;
+ cfs_waitq_signal(&obd->obd_next_transno_waitq);
+ }
+ cfs_spin_unlock_bh(&obd->obd_processing_task_lock);
+ cfs_wait_for_completion(&trd->trd_finishing);
} else {
- spin_unlock_bh(&obd->obd_processing_task_lock);
+ cfs_spin_unlock_bh(&obd->obd_processing_task_lock);
}
}
}
EXPORT_SYMBOL(target_recovery_fini);
-void target_recovery_init(struct obd_device *obd, svc_handler_t handler)
+static void target_recovery_expired(unsigned long castmeharder)
+{
+ struct obd_device *obd = (struct obd_device *)castmeharder;
+ CDEBUG(D_HA, "%s: recovery timed out; %d clients are still in recovery"
+ " after %lds (%d clients connected)\n",
+ obd->obd_name, cfs_atomic_read(&obd->obd_lock_replay_clients),
+ cfs_time_current_sec()- obd->obd_recovery_start,
+ obd->obd_connected_clients);
+
+ cfs_spin_lock_bh(&obd->obd_processing_task_lock);
+ obd->obd_recovery_expired = 1;
+ cfs_waitq_signal(&obd->obd_next_transno_waitq);
+ cfs_spin_unlock_bh(&obd->obd_processing_task_lock);
+}
+
+void target_recovery_init(struct lu_target *lut, svc_handler_t handler)
{
- if (obd->obd_max_recoverable_clients == 0)
+ struct obd_device *obd = lut->lut_obd;
+ if (obd->obd_max_recoverable_clients == 0) {
+ /** Update server last boot epoch */
+ lut_boot_epoch_update(lut);
return;
-
+ }
+
CWARN("RECOVERY: service %s, %d recoverable clients, "
"last_transno "LPU64"\n", obd->obd_name,
obd->obd_max_recoverable_clients, obd->obd_last_committed);
+ LASSERT(obd->obd_stopping == 0);
obd->obd_next_recovery_transno = obd->obd_last_committed + 1;
- target_start_recovery_thread(obd, handler);
- obd->obd_recovery_start = CURRENT_SECONDS;
- /* Only used for lprocfs_status */
- obd->obd_recovery_end = obd->obd_recovery_start + OBD_RECOVERY_TIMEOUT;
+ obd->obd_recovery_start = 0;
+ obd->obd_recovery_end = 0;
+ obd->obd_recovery_timeout = OBD_RECOVERY_FACTOR * obd_timeout;
+ /* bz13079: this should be set to desired value for ost but not for mds */
+ obd->obd_recovery_max_time = OBD_RECOVERY_MAX_TIME;
+ cfs_timer_init(&obd->obd_recovery_timer, target_recovery_expired, obd);
+ target_start_recovery_thread(lut, handler);
}
EXPORT_SYMBOL(target_recovery_init);
#endif
-int target_process_req_flags(struct obd_device *obd, struct ptlrpc_request *req)
+static int target_process_req_flags(struct obd_device *obd,
+ struct ptlrpc_request *req)
{
struct obd_export *exp = req->rq_export;
LASSERT(exp != NULL);
if (lustre_msg_get_flags(req->rq_reqmsg) & MSG_REQ_REPLAY_DONE) {
/* client declares he's ready to replay locks */
- spin_lock_bh(&obd->obd_processing_task_lock);
+ cfs_spin_lock_bh(&obd->obd_processing_task_lock);
if (exp->exp_req_replay_needed) {
- LASSERT(atomic_read(&obd->obd_req_replay_clients) > 0);
- spin_lock(&exp->exp_lock);
+ LASSERT(cfs_atomic_read(&obd->obd_req_replay_clients) >
+ 0);
+ cfs_spin_lock(&exp->exp_lock);
exp->exp_req_replay_needed = 0;
- spin_unlock(&exp->exp_lock);
- atomic_dec(&obd->obd_req_replay_clients);
- LASSERT(obd->obd_recoverable_clients > 0);
- obd->obd_recoverable_clients--;
- if (atomic_read(&obd->obd_req_replay_clients) == 0)
- CDEBUG(D_HA, "all clients have replayed reqs\n");
- wake_up(&obd->obd_next_transno_waitq);
+ cfs_spin_unlock(&exp->exp_lock);
+ cfs_atomic_dec(&obd->obd_req_replay_clients);
}
- spin_unlock_bh(&obd->obd_processing_task_lock);
+ cfs_spin_unlock_bh(&obd->obd_processing_task_lock);
}
if (lustre_msg_get_flags(req->rq_reqmsg) & MSG_LOCK_REPLAY_DONE) {
/* client declares he's ready to complete recovery
* so, we put the request on th final queue */
- spin_lock_bh(&obd->obd_processing_task_lock);
+ cfs_spin_lock_bh(&obd->obd_processing_task_lock);
if (exp->exp_lock_replay_needed) {
- LASSERT(atomic_read(&obd->obd_lock_replay_clients) > 0);
- spin_lock(&exp->exp_lock);
+ LASSERT(cfs_atomic_read(&obd->obd_lock_replay_clients) >
+ 0);
+ cfs_spin_lock(&exp->exp_lock);
exp->exp_lock_replay_needed = 0;
- spin_unlock(&exp->exp_lock);
- atomic_dec(&obd->obd_lock_replay_clients);
- if (atomic_read(&obd->obd_lock_replay_clients) == 0)
- CDEBUG(D_HA, "all clients have replayed locks\n");
- wake_up(&obd->obd_next_transno_waitq);
+ cfs_spin_unlock(&exp->exp_lock);
+ cfs_atomic_dec(&obd->obd_lock_replay_clients);
}
- spin_unlock_bh(&obd->obd_processing_task_lock);
+ cfs_spin_unlock_bh(&obd->obd_processing_task_lock);
}
return 0;
int target_queue_recovery_request(struct ptlrpc_request *req,
struct obd_device *obd)
{
- struct list_head *tmp;
+ cfs_list_t *tmp;
int inserted = 0;
__u64 transno = lustre_msg_get_transno(req->rq_reqmsg);
-
ENTRY;
if (obd->obd_recovery_data.trd_processing_task == cfs_curproc_pid()) {
if (lustre_msg_get_flags(req->rq_reqmsg) & MSG_LOCK_REPLAY_DONE) {
/* client declares he's ready to complete recovery
* so, we put the request on th final queue */
- req = ptlrpc_clone_req(req);
- if (req == NULL)
- RETURN(-ENOMEM);
+ target_request_copy_get(req);
DEBUG_REQ(D_HA, req, "queue final req");
- spin_lock_bh(&obd->obd_processing_task_lock);
- if (obd->obd_recovering)
- list_add_tail(&req->rq_list, &obd->obd_final_req_queue);
- else {
- spin_unlock_bh(&obd->obd_processing_task_lock);
- ptlrpc_free_clone(req);
- if (obd->obd_stopping) {
- RETURN(-ENOTCONN);
- } else {
- RETURN(1);
- }
+ cfs_spin_lock_bh(&obd->obd_processing_task_lock);
+ cfs_waitq_signal(&obd->obd_next_transno_waitq);
+ if (obd->obd_recovering) {
+ cfs_list_add_tail(&req->rq_list,
+ &obd->obd_final_req_queue);
+ } else {
+ cfs_spin_unlock_bh(&obd->obd_processing_task_lock);
+ target_request_copy_put(req);
+ RETURN(obd->obd_stopping ? -ENOTCONN : 1);
}
- spin_unlock_bh(&obd->obd_processing_task_lock);
+ cfs_spin_unlock_bh(&obd->obd_processing_task_lock);
RETURN(0);
}
if (lustre_msg_get_flags(req->rq_reqmsg) & MSG_REQ_REPLAY_DONE) {
/* client declares he's ready to replay locks */
- req = ptlrpc_clone_req(req);
- if (req == NULL)
- RETURN(-ENOMEM);
+ target_request_copy_get(req);
DEBUG_REQ(D_HA, req, "queue lock replay req");
- spin_lock_bh(&obd->obd_processing_task_lock);
+ cfs_spin_lock_bh(&obd->obd_processing_task_lock);
+ cfs_waitq_signal(&obd->obd_next_transno_waitq);
LASSERT(obd->obd_recovering);
/* usually due to recovery abort */
if (!req->rq_export->exp_in_recovery) {
- spin_unlock_bh(&obd->obd_processing_task_lock);
- ptlrpc_free_clone(req);
+ cfs_spin_unlock_bh(&obd->obd_processing_task_lock);
+ target_request_copy_put(req);
RETURN(-ENOTCONN);
}
LASSERT(req->rq_export->exp_lock_replay_needed);
- list_add_tail(&req->rq_list, &obd->obd_lock_replay_queue);
- spin_unlock_bh(&obd->obd_processing_task_lock);
- wake_up(&obd->obd_next_transno_waitq);
+ cfs_list_add_tail(&req->rq_list, &obd->obd_lock_replay_queue);
+ cfs_spin_unlock_bh(&obd->obd_processing_task_lock);
RETURN(0);
}
RETURN(1);
}
- spin_lock_bh(&obd->obd_processing_task_lock);
+ cfs_spin_lock_bh(&obd->obd_processing_task_lock);
/* If we're processing the queue, we want don't want to queue this
* message.
obd->obd_next_recovery_transno, transno, obd->obd_req_replaying);
if (transno < obd->obd_next_recovery_transno && obd->obd_req_replaying) {
/* Processing the queue right now, don't re-add. */
- LASSERT(list_empty(&req->rq_list));
- spin_unlock_bh(&obd->obd_processing_task_lock);
+ LASSERT(cfs_list_empty(&req->rq_list));
+ cfs_spin_unlock_bh(&obd->obd_processing_task_lock);
RETURN(1);
}
- spin_unlock_bh(&obd->obd_processing_task_lock);
+ cfs_spin_unlock_bh(&obd->obd_processing_task_lock);
- /* A resent, replayed request that is still on the queue; just drop it.
- The queued request will handle this. */
- if ((lustre_msg_get_flags(req->rq_reqmsg) & (MSG_RESENT|MSG_REPLAY)) ==
- (MSG_RESENT | MSG_REPLAY)) {
- DEBUG_REQ(D_ERROR, req, "dropping resent queued req");
+ if (OBD_FAIL_CHECK(OBD_FAIL_TGT_REPLAY_DROP))
RETURN(0);
- }
- req = ptlrpc_clone_req(req);
- if (req == NULL)
- RETURN(-ENOMEM);
-
- spin_lock_bh(&obd->obd_processing_task_lock);
+ target_request_copy_get(req);
+ cfs_spin_lock_bh(&obd->obd_processing_task_lock);
LASSERT(obd->obd_recovering);
if (!req->rq_export->exp_in_recovery) {
- spin_unlock_bh(&obd->obd_processing_task_lock);
- ptlrpc_free_clone(req);
+ cfs_spin_unlock_bh(&obd->obd_processing_task_lock);
+ target_request_copy_put(req);
RETURN(-ENOTCONN);
}
LASSERT(req->rq_export->exp_req_replay_needed);
+ if (target_exp_enqueue_req_replay(req)) {
+ cfs_spin_unlock_bh(&obd->obd_processing_task_lock);
+ DEBUG_REQ(D_ERROR, req, "dropping resent queued req");
+ target_request_copy_put(req);
+ RETURN(0);
+ }
+
/* XXX O(n^2) */
- list_for_each(tmp, &obd->obd_req_replay_queue) {
+ cfs_list_for_each(tmp, &obd->obd_req_replay_queue) {
struct ptlrpc_request *reqiter =
- list_entry(tmp, struct ptlrpc_request, rq_list);
+ cfs_list_entry(tmp, struct ptlrpc_request, rq_list);
if (lustre_msg_get_transno(reqiter->rq_reqmsg) > transno) {
- list_add_tail(&req->rq_list, &reqiter->rq_list);
+ cfs_list_add_tail(&req->rq_list, &reqiter->rq_list);
inserted = 1;
break;
}
+
+ if (unlikely(lustre_msg_get_transno(reqiter->rq_reqmsg) ==
+ transno)) {
+ DEBUG_REQ(D_ERROR, req, "dropping replay: transno "
+ "has been claimed by another client");
+ cfs_spin_unlock_bh(&obd->obd_processing_task_lock);
+ target_exp_dequeue_req_replay(req);
+ target_request_copy_put(req);
+ RETURN(0);
+ }
}
if (!inserted)
- list_add_tail(&req->rq_list, &obd->obd_req_replay_queue);
+ cfs_list_add_tail(&req->rq_list, &obd->obd_req_replay_queue);
obd->obd_requests_queued_for_recovery++;
- wake_up(&obd->obd_next_transno_waitq);
- spin_unlock_bh(&obd->obd_processing_task_lock);
+ cfs_waitq_signal(&obd->obd_next_transno_waitq);
+ cfs_spin_unlock_bh(&obd->obd_processing_task_lock);
RETURN(0);
-
-}
-
-struct obd_device * target_req2obd(struct ptlrpc_request *req)
-{
- return req->rq_export->exp_obd;
-}
-
-static inline struct ldlm_pool *ldlm_exp2pl(struct obd_export *exp)
-{
- LASSERT(exp != NULL);
- return &exp->exp_obd->obd_namespace->ns_pool;
}
+/**
+ * Packs current SLV and Limit into \a req.
+ */
int target_pack_pool_reply(struct ptlrpc_request *req)
{
- struct ldlm_pool *pl;
+ struct obd_device *obd;
ENTRY;
-
- if (!req->rq_export || !exp_connect_lru_resize(req->rq_export)) {
+
+ /*
+ * Check that we still have all structures alive as this may
+ * be some late rpc in shutdown time.
+ */
+ if (unlikely(!req->rq_export || !req->rq_export->exp_obd ||
+ !exp_connect_lru_resize(req->rq_export))) {
lustre_msg_set_slv(req->rq_repmsg, 0);
lustre_msg_set_limit(req->rq_repmsg, 0);
RETURN(0);
}
-
- pl = ldlm_exp2pl(req->rq_export);
- spin_lock(&pl->pl_lock);
- LASSERT(ldlm_pool_get_slv(pl) != 0 && ldlm_pool_get_limit(pl) != 0);
- lustre_msg_set_slv(req->rq_repmsg, ldlm_pool_get_slv(pl));
- lustre_msg_set_limit(req->rq_repmsg, ldlm_pool_get_limit(pl));
- spin_unlock(&pl->pl_lock);
+ /*
+ * OBD is alive here as export is alive, which we checked above.
+ */
+ obd = req->rq_export->exp_obd;
+
+ cfs_read_lock(&obd->obd_pool_lock);
+ lustre_msg_set_slv(req->rq_repmsg, obd->obd_pool_slv);
+ lustre_msg_set_limit(req->rq_repmsg, obd->obd_pool_limit);
+ cfs_read_unlock(&obd->obd_pool_lock);
RETURN(0);
}
if (unlikely(rc)) {
DEBUG_REQ(D_ERROR, req, "processing error (%d)", rc);
req->rq_status = rc;
- return (ptlrpc_error(req));
+ return (ptlrpc_send_error(req, 1));
} else {
DEBUG_REQ(D_NET, req, "sending reply");
}
- return (ptlrpc_send_reply(req, 1));
+ return (ptlrpc_send_reply(req, PTLRPC_REPLY_MAYBE_DIFFICULT));
}
void target_send_reply(struct ptlrpc_request *req, int rc, int fail_id)
struct obd_device *obd;
struct obd_export *exp;
struct ptlrpc_service *svc;
+ ENTRY;
- if (req->rq_no_reply)
+ if (req->rq_no_reply) {
+ EXIT;
return;
+ }
svc = req->rq_rqbd->rqbd_service;
rs = req->rq_reply_state;
if (rs == NULL || !rs->rs_difficult) {
/* no notifiers */
target_send_reply_msg (req, rc, fail_id);
+ EXIT;
return;
}
LASSERT (!rs->rs_handled);
LASSERT (!rs->rs_on_net);
LASSERT (rs->rs_export == NULL);
- LASSERT (list_empty(&rs->rs_obd_list));
- LASSERT (list_empty(&rs->rs_exp_list));
+ LASSERT (cfs_list_empty(&rs->rs_obd_list));
+ LASSERT (cfs_list_empty(&rs->rs_exp_list));
exp = class_export_get (req->rq_export);
obd = exp->exp_obd;
- /* disable reply scheduling onto srv_reply_queue while I'm setting up */
+ /* disable reply scheduling while I'm setting up */
rs->rs_scheduled = 1;
rs->rs_on_net = 1;
rs->rs_xid = req->rq_xid;
rs->rs_transno = req->rq_transno;
rs->rs_export = exp;
+ rs->rs_opc = lustre_msg_get_opc(rs->rs_msg);
- spin_lock(&obd->obd_uncommitted_replies_lock);
-
- if (rs->rs_transno > obd->obd_last_committed) {
+ cfs_spin_lock(&exp->exp_uncommitted_replies_lock);
+ CDEBUG(D_NET, "rs transno = "LPU64", last committed = "LPU64"\n",
+ rs->rs_transno, exp->exp_last_committed);
+ if (rs->rs_transno > exp->exp_last_committed) {
/* not committed already */
- list_add_tail (&rs->rs_obd_list,
- &obd->obd_uncommitted_replies);
+ cfs_list_add_tail(&rs->rs_obd_list,
+ &exp->exp_uncommitted_replies);
}
+ cfs_spin_unlock (&exp->exp_uncommitted_replies_lock);
- spin_unlock (&obd->obd_uncommitted_replies_lock);
- spin_lock (&exp->exp_lock);
-
- list_add_tail (&rs->rs_exp_list, &exp->exp_outstanding_replies);
-
- spin_unlock(&exp->exp_lock);
+ cfs_spin_lock(&exp->exp_lock);
+ cfs_list_add_tail(&rs->rs_exp_list, &exp->exp_outstanding_replies);
+ cfs_spin_unlock(&exp->exp_lock);
netrc = target_send_reply_msg (req, rc, fail_id);
- spin_lock(&svc->srv_lock);
+ cfs_spin_lock(&svc->srv_lock);
- svc->srv_n_difficult_replies++;
+ cfs_atomic_inc(&svc->srv_n_difficult_replies);
if (netrc != 0) {
/* error sending: reply is off the net. Also we need +1
- * reply ref until ptlrpc_server_handle_reply() is done
+ * reply ref until ptlrpc_handle_rs() is done
* with the reply state (if the send was successful, there
* would have been +1 ref for the net, which
* reply_out_callback leaves alone) */
rs->rs_on_net = 0;
ptlrpc_rs_addref(rs);
- atomic_inc (&svc->srv_outstanding_replies);
+ cfs_atomic_inc (&svc->srv_outstanding_replies);
}
- if (!rs->rs_on_net || /* some notifier */
- list_empty(&rs->rs_exp_list) || /* completed already */
- list_empty(&rs->rs_obd_list)) {
- list_add_tail (&rs->rs_list, &svc->srv_reply_queue);
- cfs_waitq_signal (&svc->srv_waitq);
+ cfs_spin_lock(&rs->rs_lock);
+ if (rs->rs_transno <= exp->exp_last_committed ||
+ (!rs->rs_on_net && !rs->rs_no_ack) ||
+ cfs_list_empty(&rs->rs_exp_list) || /* completed already */
+ cfs_list_empty(&rs->rs_obd_list)) {
+ CDEBUG(D_HA, "Schedule reply immediately\n");
+ ptlrpc_dispatch_difficult_reply(rs);
} else {
- list_add (&rs->rs_list, &svc->srv_active_replies);
+ cfs_list_add (&rs->rs_list, &svc->srv_active_replies);
rs->rs_scheduled = 0; /* allow notifier to schedule */
}
-
- spin_unlock(&svc->srv_lock);
+ cfs_spin_unlock(&rs->rs_lock);
+ cfs_spin_unlock(&svc->srv_lock);
+ EXIT;
}
int target_handle_ping(struct ptlrpc_request *req)
{
obd_ping(req->rq_export);
- return lustre_pack_reply(req, 1, NULL, NULL);
+ return req_capsule_server_pack(&req->rq_pill);
}
void target_committed_to_req(struct ptlrpc_request *req)
{
- struct obd_device *obd;
-
- if (req == NULL || req->rq_export == NULL)
- return;
-
- obd = req->rq_export->exp_obd;
- if (obd == NULL)
- return;
+ struct obd_export *exp = req->rq_export;
- if (!obd->obd_no_transno && req->rq_repmsg != NULL)
+ if (!exp->exp_obd->obd_no_transno && req->rq_repmsg != NULL)
lustre_msg_set_last_committed(req->rq_repmsg,
- obd->obd_last_committed);
+ exp->exp_last_committed);
else
- DEBUG_REQ(D_IOCTL, req, "not sending last_committed update");
+ DEBUG_REQ(D_IOCTL, req, "not sending last_committed update (%d/"
+ "%d)", exp->exp_obd->obd_no_transno,
+ req->rq_repmsg == NULL);
CDEBUG(D_INFO, "last_committed "LPU64", transno "LPU64", xid "LPU64"\n",
- obd->obd_last_committed, req->rq_transno, req->rq_xid);
+ exp->exp_last_committed, req->rq_transno, req->rq_xid);
}
-
EXPORT_SYMBOL(target_committed_to_req);
-#ifdef HAVE_QUOTA_SUPPORT
int target_handle_qc_callback(struct ptlrpc_request *req)
{
struct obd_quotactl *oqctl;
struct client_obd *cli = &req->rq_export->exp_obd->u.cli;
- oqctl = lustre_swab_reqbuf(req, REQ_REC_OFF, sizeof(*oqctl),
- lustre_swab_obd_quotactl);
+ oqctl = req_capsule_client_get(&req->rq_pill, &RMF_OBD_QUOTACTL);
if (oqctl == NULL) {
CERROR("Can't unpack obd_quotactl\n");
RETURN(-EPROTO);
return 0;
}
+#ifdef HAVE_QUOTA_SUPPORT
int target_handle_dqacq_callback(struct ptlrpc_request *req)
{
#ifdef __KERNEL__
struct obd_device *obd = req->rq_export->exp_obd;
- struct obd_device *master_obd;
+ struct obd_device *master_obd = NULL, *lov_obd = NULL;
+ struct obd_device_target *obt;
struct lustre_quota_ctxt *qctxt;
- struct qunit_data *qdata;
- void* rep;
- struct qunit_data_old *qdata_old;
+ struct qunit_data *qdata = NULL;
int rc = 0;
- int repsize[2] = { sizeof(struct ptlrpc_body),
- sizeof(struct qunit_data) };
ENTRY;
- rc = lustre_pack_reply(req, 2, repsize, NULL);
- if (rc)
+ if (OBD_FAIL_CHECK(OBD_FAIL_MDS_DROP_QUOTA_REQ))
+ RETURN(rc);
+
+ rc = req_capsule_server_pack(&req->rq_pill);
+ if (rc) {
+ CERROR("packing reply failed!: rc = %d\n", rc);
RETURN(rc);
+ }
LASSERT(req->rq_export);
- /* fixed for bug10707 */
- if ((req->rq_export->exp_connect_flags & OBD_CONNECT_QUOTA64) &&
- !OBD_FAIL_CHECK(OBD_FAIL_QUOTA_QD_COUNT_32BIT)) {
- CDEBUG(D_QUOTA, "qd_count is 64bit!\n");
- rep = lustre_msg_buf(req->rq_repmsg, REPLY_REC_OFF,
- sizeof(struct qunit_data));
- LASSERT(rep);
- qdata = lustre_swab_reqbuf(req, REQ_REC_OFF, sizeof(*qdata),
- lustre_swab_qdata);
- } else {
- CDEBUG(D_QUOTA, "qd_count is 32bit!\n");
- rep = lustre_msg_buf(req->rq_repmsg, REPLY_REC_OFF,
- sizeof(struct qunit_data_old));
- LASSERT(rep);
- qdata_old = lustre_swab_reqbuf(req, REQ_REC_OFF, sizeof(*qdata_old),
- lustre_swab_qdata_old);
- qdata = lustre_quota_old_to_new(qdata_old);
+ qdata = quota_get_qdata(req, QUOTA_REQUEST, QUOTA_EXPORT);
+ if (IS_ERR(qdata)) {
+ rc = PTR_ERR(qdata);
+ CDEBUG(D_ERROR, "Can't unpack qunit_data(rc: %d)\n", rc);
+ req->rq_status = rc;
+ GOTO(out, rc);
}
- if (qdata == NULL) {
- CERROR("Can't unpack qunit_data\n");
- RETURN(-EPROTO);
+ /* we use the observer */
+ if (obd_pin_observer(obd, &lov_obd) ||
+ obd_pin_observer(lov_obd, &master_obd)) {
+ CERROR("Can't find the observer, it is recovering\n");
+ req->rq_status = -EAGAIN;
+ GOTO(out, rc);
}
- /* we use the observer */
- LASSERT(obd->obd_observer && obd->obd_observer->obd_observer);
- master_obd = obd->obd_observer->obd_observer;
- qctxt = &master_obd->u.obt.obt_qctxt;
+ obt = &master_obd->u.obt;
+ qctxt = &obt->obt_qctxt;
+
+ if (!qctxt->lqc_setup || !qctxt->lqc_valid) {
+ /* quota_type has not been processed yet, return EAGAIN
+ * until we know whether or not quotas are supposed to
+ * be enabled */
+ CDEBUG(D_QUOTA, "quota_type not processed yet, return "
+ "-EAGAIN\n");
+ req->rq_status = -EAGAIN;
+ GOTO(out, rc);
+ }
+
+ cfs_down_read(&obt->obt_rwsem);
+ if (qctxt->lqc_lqs_hash == NULL) {
+ cfs_up_read(&obt->obt_rwsem);
+ /* quota_type has not been processed yet, return EAGAIN
+ * until we know whether or not quotas are supposed to
+ * be enabled */
+ CDEBUG(D_QUOTA, "quota_ctxt is not ready yet, return "
+ "-EAGAIN\n");
+ req->rq_status = -EAGAIN;
+ GOTO(out, rc);
+ }
LASSERT(qctxt->lqc_handler);
rc = qctxt->lqc_handler(master_obd, qdata,
lustre_msg_get_opc(req->rq_reqmsg));
+ cfs_up_read(&obt->obt_rwsem);
if (rc && rc != -EDQUOT)
CDEBUG(rc == -EBUSY ? D_QUOTA : D_ERROR,
- "dqacq failed! (rc:%d)\n", rc);
+ "dqacq/dqrel failed! (rc:%d)\n", rc);
+ req->rq_status = rc;
- /* the qd_count might be changed in lqc_handler */
- if ((req->rq_export->exp_connect_flags & OBD_CONNECT_QUOTA64) &&
- !OBD_FAIL_CHECK(OBD_FAIL_QUOTA_QD_COUNT_32BIT)) {
- memcpy(rep,qdata,sizeof(*qdata));
- } else {
- qdata_old = lustre_quota_new_to_old(qdata);
- memcpy(rep,qdata_old,sizeof(*qdata_old));
+ rc = quota_copy_qdata(req, qdata, QUOTA_REPLY, QUOTA_EXPORT);
+ if (rc < 0) {
+ CERROR("Can't pack qunit_data(rc: %d)\n", rc);
+ GOTO(out, rc);
}
- req->rq_status = rc;
- rc = ptlrpc_reply(req);
- RETURN(rc);
+ /* Block the quota req. b=14840 */
+ OBD_FAIL_TIMEOUT(OBD_FAIL_MDS_BLOCK_QUOTA_REQ, obd_timeout);
+ EXIT;
+
+out:
+ if (master_obd)
+ obd_unpin_observer(lov_obd);
+ if (lov_obd)
+ obd_unpin_observer(obd);
+
+ rc = ptlrpc_reply(req);
+ return rc;
#else
return 0;
#endif /* !__KERNEL__ */
[LCK_CW] LCK_COMPAT_CW,
[LCK_CR] LCK_COMPAT_CR,
[LCK_NL] LCK_COMPAT_NL,
- [LCK_GROUP] LCK_COMPAT_GROUP
+ [LCK_GROUP] LCK_COMPAT_GROUP,
+ [LCK_COS] LCK_COMPAT_COS,
};
+
+/**
+ * Rather arbitrary mapping from LDLM error codes to errno values. This should
+ * not escape to the user level.
+ */
+int ldlm_error2errno(ldlm_error_t error)
+{
+ int result;
+
+ switch (error) {
+ case ELDLM_OK:
+ result = 0;
+ break;
+ case ELDLM_LOCK_CHANGED:
+ result = -ESTALE;
+ break;
+ case ELDLM_LOCK_ABORTED:
+ result = -ENAVAIL;
+ break;
+ case ELDLM_LOCK_REPLACED:
+ result = -ESRCH;
+ break;
+ case ELDLM_NO_LOCK_DATA:
+ result = -ENOENT;
+ break;
+ case ELDLM_NAMESPACE_EXISTS:
+ result = -EEXIST;
+ break;
+ case ELDLM_BAD_NAMESPACE:
+ result = -EBADF;
+ break;
+ default:
+ if (((int)error) < 0) /* cast to signed type */
+ result = error; /* as ldlm_error_t can be unsigned */
+ else {
+ CERROR("Invalid DLM result code: %i\n", error);
+ result = -EPROTO;
+ }
+ }
+ return result;
+}
+EXPORT_SYMBOL(ldlm_error2errno);
+
+/**
+ * Dual to ldlm_error2errno(): maps errno values back to ldlm_error_t.
+ */
+ldlm_error_t ldlm_errno2error(int err_no)
+{
+ int error;
+
+ switch (err_no) {
+ case 0:
+ error = ELDLM_OK;
+ break;
+ case -ESTALE:
+ error = ELDLM_LOCK_CHANGED;
+ break;
+ case -ENAVAIL:
+ error = ELDLM_LOCK_ABORTED;
+ break;
+ case -ESRCH:
+ error = ELDLM_LOCK_REPLACED;
+ break;
+ case -ENOENT:
+ error = ELDLM_NO_LOCK_DATA;
+ break;
+ case -EEXIST:
+ error = ELDLM_NAMESPACE_EXISTS;
+ break;
+ case -EBADF:
+ error = ELDLM_BAD_NAMESPACE;
+ break;
+ default:
+ error = err_no;
+ }
+ return error;
+}
+EXPORT_SYMBOL(ldlm_errno2error);
+
+#if LUSTRE_TRACKS_LOCK_EXP_REFS
+void ldlm_dump_export_locks(struct obd_export *exp)
+{
+ cfs_spin_lock(&exp->exp_locks_list_guard);
+ if (!cfs_list_empty(&exp->exp_locks_list)) {
+ struct ldlm_lock *lock;
+
+ CERROR("dumping locks for export %p,"
+ "ignore if the unmount doesn't hang\n", exp);
+ cfs_list_for_each_entry(lock, &exp->exp_locks_list, l_exp_refs_link)
+ ldlm_lock_dump(D_ERROR, lock, 0);
+ }
+ cfs_spin_unlock(&exp->exp_locks_list_guard);
+}
+#endif
git://git.whamcloud.com / fs / lustre-release.git / blobdiff