Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
LU-1944 ldlm: Add another net_latency to recoverry timer.
[fs/lustre-release.git]
/
lustre
/
ldlm
/
ldlm_lib.c
diff --git
a/lustre/ldlm/ldlm_lib.c
b/lustre/ldlm/ldlm_lib.c
index
54780a7
..
a7ada1b
100644
(file)
--- a/
lustre/ldlm/ldlm_lib.c
+++ b/
lustre/ldlm/ldlm_lib.c
@@
-131,6
+131,7
@@
int client_import_add_conn(struct obd_import *imp, struct obd_uuid *uuid,
{
return import_set_conn(imp, uuid, priority, 1);
}
+EXPORT_SYMBOL(client_import_add_conn);
int client_import_del_conn(struct obd_import *imp, struct obd_uuid *uuid)
{
@@
-186,6
+187,7
@@
out:
CERROR("connection %s not found\n", uuid->uuid);
RETURN(rc);
}
+EXPORT_SYMBOL(client_import_del_conn);
/**
* Find conn uuid by peer nid. @peer is a server nid. This function is used
@@
-359,6
+361,15
@@
int client_obd_setup(struct obd_device *obddev, struct lustre_cfg *lcfg)
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);
+
+ /* lru for osc. */
+ CFS_INIT_LIST_HEAD(&cli->cl_lru_osc);
+ cfs_atomic_set(&cli->cl_lru_shrinkers, 0);
+ cfs_atomic_set(&cli->cl_lru_busy, 0);
+ cfs_atomic_set(&cli->cl_lru_in_list, 0);
+ CFS_INIT_LIST_HEAD(&cli->cl_lru_list);
+ client_obd_list_lock_init(&cli->cl_lru_list_lock);
+
cfs_waitq_init(&cli->cl_destroy_waitq);
cfs_atomic_set(&cli->cl_destroy_in_flight, 0);
#ifdef ENABLE_CHECKSUM
@@
-455,6
+466,7
@@
err:
RETURN(rc);
}
+EXPORT_SYMBOL(client_obd_setup);
int client_obd_cleanup(struct obd_device *obddev)
{
@@
-468,6
+480,7
@@
int client_obd_cleanup(struct obd_device *obddev)
ldlm_put_ref();
RETURN(0);
}
+EXPORT_SYMBOL(client_obd_cleanup);
/* ->o_connect() method for client side (OSC and MDC and MGC) */
int client_connect_import(const struct lu_env *env,
@@
-536,6
+549,7
@@
out_sem:
return rc;
}
+EXPORT_SYMBOL(client_connect_import);
int client_disconnect_export(struct obd_export *exp)
{
@@
-610,6
+624,7
@@
int client_disconnect_export(struct obd_export *exp)
RETURN(rc);
}
+EXPORT_SYMBOL(client_disconnect_export);
#ifdef HAVE_SERVER_SUPPORT
int server_disconnect_export(struct obd_export *exp)
@@
-647,6
+662,7
@@
int server_disconnect_export(struct obd_export *exp)
RETURN(rc);
}
+EXPORT_SYMBOL(server_disconnect_export);
/* --------------------------------------------------------------------------
* from old lib/target.c
@@
-1105,8
+1121,8
@@
dont_check_exports:
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);
-
CDEBUG(D_RPCTRACE, "%s: %s already connected at high
er "
-
"conn_cnt: %d >
%d\n",
+
CDEBUG(D_RPCTRACE, "%s: %s already connected at great
er "
+
"or equal conn_cnt: %d >=
%d\n",
cluuid.uuid, libcfs_nid2str(req->rq_peer.nid),
export->exp_conn_cnt,
lustre_msg_get_conn_cnt(req->rq_reqmsg));
@@
-1205,13
+1221,9
@@
dont_check_exports:
}
cfs_spin_lock(&export->exp_lock);
- if (export->exp_imp_reverse != NULL)
{
+ if (export->exp_imp_reverse != NULL)
/* destroyed import can be still referenced in ctxt */
- obd_set_info_async(req->rq_svc_thread->t_env, export,
- sizeof(KEY_REVIMP_UPD), KEY_REVIMP_UPD,
- 0, NULL, NULL);
tmp_imp = export->exp_imp_reverse;
- }
export->exp_imp_reverse = revimp;
cfs_spin_unlock(&export->exp_lock);
@@
-1225,13
+1237,13
@@
dont_check_exports:
* 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;
+
if ((data->ocd
_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;
-
if ((export->exp
_connect_flags & OBD_CONNECT_FULL20) &&
+
if ((data->ocd
_connect_flags & OBD_CONNECT_FULL20) &&
(revimp->imp_msg_magic != LUSTRE_MSG_MAGIC_V1))
revimp->imp_msghdr_flags |= MSGHDR_CKSUM_INCOMPAT18;
else
@@
-1269,6
+1281,7
@@
out:
req->rq_status = rc;
RETURN(rc);
}
+EXPORT_SYMBOL(target_handle_connect);
int target_handle_disconnect(struct ptlrpc_request *req)
{
@@
-1284,6
+1297,7
@@
int target_handle_disconnect(struct ptlrpc_request *req)
RETURN(0);
}
+EXPORT_SYMBOL(target_handle_disconnect);
void target_destroy_export(struct obd_export *exp)
{
@@
-1304,6
+1318,7
@@
void target_destroy_export(struct obd_export *exp)
LASSERT_ATOMIC_ZERO(&exp->exp_cb_count);
LASSERT_ATOMIC_ZERO(&exp->exp_replay_count);
}
+EXPORT_SYMBOL(target_destroy_export);
/*
* Recovery functions
@@
-1509,6
+1524,7
@@
void target_cleanup_recovery(struct obd_device *obd)
EXIT;
}
+EXPORT_SYMBOL(target_cleanup_recovery);
/* obd_recovery_task_lock should be held */
void target_cancel_recovery_timer(struct obd_device *obd)
@@
-1516,6
+1532,7
@@
void target_cancel_recovery_timer(struct obd_device *obd)
CDEBUG(D_HA, "%s: cancel recovery timer\n", obd->obd_name);
cfs_timer_disarm(&obd->obd_recovery_timer);
}
+EXPORT_SYMBOL(target_cancel_recovery_timer);
static void target_start_recovery_timer(struct obd_device *obd)
{
@@
-1941,8
+1958,11
@@
static int handle_recovery_req(struct ptlrpc_thread *thread,
to = max((int)at_est2timeout(
at_get(&svcpt->scp_at_estimate)),
(int)lustre_msg_get_timeout(req->rq_reqmsg));
- /* Add net_latency (see ptlrpc_replay_req) */
- to += lustre_msg_get_service_time(req->rq_reqmsg);
+ /* Add 2 net_latency, one for balance rq_deadline
+ * (see ptl_send_rpc), one for resend the req to server,
+ * Note: client will pack net_latency in replay req
+ * (see ptlrpc_replay_req) */
+ to += 2 * lustre_msg_get_service_time(req->rq_reqmsg);
}
extend_recovery_timer(class_exp2obd(req->rq_export), to, true);
}
@@
-2054,7
+2074,7
@@
static int target_recovery_thread(void *arg)
*/
CDEBUG(D_INFO, "3: final stage - process recovery completion pings\n");
/** Update server last boot epoch */
-
lu
t_boot_epoch_update(lut);
+
tg
t_boot_epoch_update(lut);
/* We drop recoverying flag to forward all new requests
* to regular mds_handle() since now */
cfs_spin_lock(&obd->obd_dev_lock);
@@
-2127,6
+2147,7
@@
void target_stop_recovery_thread(struct obd_device *obd)
cfs_wait_for_completion(&trd->trd_finishing);
}
}
+EXPORT_SYMBOL(target_stop_recovery_thread);
void target_recovery_fini(struct obd_device *obd)
{
@@
-2154,7
+2175,7
@@
void target_recovery_init(struct lu_target *lut, svc_handler_t handler)
struct obd_device *obd = lut->lut_obd;
if (obd->obd_max_recoverable_clients == 0) {
/** Update server last boot epoch */
-
lu
t_boot_epoch_update(lut);
+
tg
t_boot_epoch_update(lut);
return;
}
@@
-2340,12
+2361,14
@@
int target_queue_recovery_request(struct ptlrpc_request *req,
cfs_waitq_signal(&obd->obd_next_transno_waitq);
RETURN(0);
}
+EXPORT_SYMBOL(target_queue_recovery_request);
int target_handle_ping(struct ptlrpc_request *req)
{
obd_ping(req->rq_svc_thread->t_env, req->rq_export);
return req_capsule_server_pack(&req->rq_pill);
}
+EXPORT_SYMBOL(target_handle_ping);
void target_committed_to_req(struct ptlrpc_request *req)
{
@@
-2397,6
+2420,7
@@
int target_pack_pool_reply(struct ptlrpc_request *req)
RETURN(0);
}
+EXPORT_SYMBOL(target_pack_pool_reply);
int target_send_reply_msg(struct ptlrpc_request *req, int rc, int fail_id)
{
@@
-2460,7
+2484,7
@@
void target_send_reply(struct ptlrpc_request *req, int rc, int fail_id)
rs->rs_xid = req->rq_xid;
rs->rs_transno = req->rq_transno;
rs->rs_export = exp;
- rs->rs_opc = lustre_msg_get_opc(r
s->rs_
msg);
+ rs->rs_opc = lustre_msg_get_opc(r
eq->rq_req
msg);
cfs_spin_lock(&exp->exp_uncommitted_replies_lock);
CDEBUG(D_NET, "rs transno = "LPU64", last committed = "LPU64"\n",
@@
-2507,6
+2531,7
@@
void target_send_reply(struct ptlrpc_request *req, int rc, int fail_id)
cfs_spin_unlock(&svcpt->scp_rep_lock);
EXIT;
}
+EXPORT_SYMBOL(target_send_reply);
ldlm_mode_t lck_compat_array[] = {
[LCK_EX] LCK_COMPAT_EX,