From 3cd092ad35b46d97b7b6f16596fa557fef850d8d Mon Sep 17 00:00:00 2001 From: tianzy Date: Tue, 21 Apr 2009 09:40:11 +0000 Subject: [PATCH] Branch b1_8 1. delete the lc_watchdog_touch_ms() 2. changing to seconds instead of ms 3. delete lcw_time in lc_watchdog b=18582 i=nathan i=johann --- lustre/include/lustre_net.h | 2 ++ lustre/ldlm/ldlm_lockd.c | 4 ++-- lustre/mds/handler.c | 2 +- lustre/mds/mds_internal.h | 2 +- lustre/mgs/mgs_handler.c | 2 +- lustre/ost/ost_internal.h | 2 +- lustre/ptlrpc/service.c | 11 +++-------- lustre/quota/quota_context.c | 3 ++- lustre/quota/quota_interface.c | 6 ++++-- 9 files changed, 17 insertions(+), 17 deletions(-) diff --git a/lustre/include/lustre_net.h b/lustre/include/lustre_net.h index 6a6db15..de90bd1 100644 --- a/lustre/include/lustre_net.h +++ b/lustre/include/lustre_net.h @@ -559,6 +559,8 @@ struct ptlrpc_thread { unsigned int t_id; /* service thread index, from ptlrpc_start_threads */ struct lc_watchdog *t_watchdog; /* put watchdog in the structure per * thread b=14840 */ + struct ptlrpc_service *t_svc; /* the svc this thread belonged to + * b=18582 */ cfs_waitq_t t_ctl_waitq; }; diff --git a/lustre/ldlm/ldlm_lockd.c b/lustre/ldlm/ldlm_lockd.c index 28d5823..3c06d8f 100644 --- a/lustre/ldlm/ldlm_lockd.c +++ b/lustre/ldlm/ldlm_lockd.c @@ -2139,7 +2139,7 @@ static int ldlm_setup(void) ldlm_state->ldlm_cb_service = ptlrpc_init_svc(LDLM_NBUFS, LDLM_BUFSIZE, LDLM_MAXREQSIZE, LDLM_MAXREPSIZE, LDLM_CB_REQUEST_PORTAL, - LDLM_CB_REPLY_PORTAL, 1800, + LDLM_CB_REPLY_PORTAL, 2, ldlm_callback_handler, "ldlm_cbd", ldlm_svc_proc_dir, NULL, ldlm_min_threads, ldlm_max_threads, @@ -2153,7 +2153,7 @@ static int ldlm_setup(void) ldlm_state->ldlm_cancel_service = ptlrpc_init_svc(LDLM_NBUFS, LDLM_BUFSIZE, LDLM_MAXREQSIZE, LDLM_MAXREPSIZE, LDLM_CANCEL_REQUEST_PORTAL, - LDLM_CANCEL_REPLY_PORTAL, 6000, + LDLM_CANCEL_REPLY_PORTAL, 6, ldlm_cancel_handler, "ldlm_canceld", ldlm_svc_proc_dir, NULL, ldlm_min_threads, ldlm_max_threads, diff --git a/lustre/mds/handler.c b/lustre/mds/handler.c index c275774..a5006b9 100644 --- a/lustre/mds/handler.c +++ b/lustre/mds/handler.c @@ -1162,7 +1162,7 @@ static int mds_statfs(struct ptlrpc_request *req) /* This will trigger a watchdog timeout */ OBD_FAIL_TIMEOUT(OBD_FAIL_MDS_STATFS_LCW_SLEEP, (MDS_SERVICE_WATCHDOG_FACTOR * - at_get(&svc->srv_at_estimate) / 1000) + 1); + at_get(&svc->srv_at_estimate)) + 1); OBD_COUNTER_INCREMENT(obd, statfs); if (OBD_FAIL_CHECK(OBD_FAIL_MDS_STATFS_PACK)) diff --git a/lustre/mds/mds_internal.h b/lustre/mds/mds_internal.h index 3ce767c..3516d6f 100644 --- a/lustre/mds/mds_internal.h +++ b/lustre/mds/mds_internal.h @@ -44,7 +44,7 @@ #define MDT_INCOMPAT_SUPP (OBD_INCOMPAT_MDT | OBD_INCOMPAT_COMMON_LR | \ OBD_INCOMPAT_FID) -#define MDS_SERVICE_WATCHDOG_FACTOR 2000 +#define MDS_SERVICE_WATCHDOG_FACTOR 2 #define MAX_ATIME_DIFF 60 diff --git a/lustre/mgs/mgs_handler.c b/lustre/mgs/mgs_handler.c index 2718f52..a177dd3 100644 --- a/lustre/mgs/mgs_handler.c +++ b/lustre/mgs/mgs_handler.c @@ -220,7 +220,7 @@ static int mgs_setup(struct obd_device *obd, obd_count len, void *buf) mgs->mgs_service = ptlrpc_init_svc(MGS_NBUFS, MGS_BUFSIZE, MGS_MAXREQSIZE, MGS_MAXREPSIZE, MGS_REQUEST_PORTAL, - MGC_REPLY_PORTAL, 2000, + MGC_REPLY_PORTAL, 2, mgs_handle, LUSTRE_MGS_NAME, obd->obd_proc_entry, NULL, MGS_THREADS_AUTO_MIN, MGS_THREADS_AUTO_MAX, diff --git a/lustre/ost/ost_internal.h b/lustre/ost/ost_internal.h index f0dc910..3cbb4fa 100644 --- a/lustre/ost/ost_internal.h +++ b/lustre/ost/ost_internal.h @@ -37,7 +37,7 @@ #ifndef OST_INTERNAL_H #define OST_INTERNAL_H -#define OSS_SERVICE_WATCHDOG_FACTOR 2000 +#define OSS_SERVICE_WATCHDOG_FACTOR 2 /* * tunables for per-thread page pool (bug 5137) diff --git a/lustre/ptlrpc/service.c b/lustre/ptlrpc/service.c index 6ce3020..8631487 100644 --- a/lustre/ptlrpc/service.c +++ b/lustre/ptlrpc/service.c @@ -1657,10 +1657,7 @@ static int ptlrpc_main(void *arg) */ cfs_waitq_signal(&thread->t_ctl_waitq); - thread->t_watchdog = lc_watchdog_add(max_t(int, obd_timeout, AT_OFF ? 0 : - at_get(&svc->srv_at_estimate)) - * svc->srv_watchdog_factor, - NULL, NULL); + thread->t_watchdog = lc_watchdog_add(GET_TIMEOUT(svc), NULL, NULL); spin_lock(&svc->srv_lock); svc->srv_threads_running++; @@ -1696,10 +1693,7 @@ static int ptlrpc_main(void *arg) svc->srv_at_check, &lwi); - lc_watchdog_touch_ms(thread->t_watchdog, max_t(int, obd_timeout, - AT_OFF ? 0 : - at_get(&svc->srv_at_estimate)) * - svc->srv_watchdog_factor); + lc_watchdog_touch(thread->t_watchdog, GET_TIMEOUT(svc)); ptlrpc_check_rqbd_pool(svc); @@ -1856,6 +1850,7 @@ int ptlrpc_start_thread(struct obd_device *dev, struct ptlrpc_service *svc) id = svc->srv_threads_started++; spin_unlock(&svc->srv_lock); + thread->t_svc = svc; thread->t_id = id; sprintf(name, "%s_%02d", svc->srv_thread_name, id); d.dev = dev; diff --git a/lustre/quota/quota_context.c b/lustre/quota/quota_context.c index 52b0891..95e0c23 100644 --- a/lustre/quota/quota_context.c +++ b/lustre/quota/quota_context.c @@ -928,7 +928,8 @@ schedule_dqacq(struct obd_device *obd, struct lustre_quota_ctxt *qctxt, l_wait_event(qctxt->lqc_wait_for_qmaster, check_qm(qctxt), &lwi); CDEBUG(D_QUOTA, "wake up when quota master is back\n"); - lc_watchdog_touch(oti->oti_thread->t_watchdog); + lc_watchdog_touch(oti->oti_thread->t_watchdog, + GET_TIMEOUT(oti->oti_thread->t_svc)); } else { spin_unlock(&qctxt->lqc_lock); } diff --git a/lustre/quota/quota_interface.c b/lustre/quota/quota_interface.c index c621c85..fb1dd26 100644 --- a/lustre/quota/quota_interface.c +++ b/lustre/quota/quota_interface.c @@ -397,7 +397,8 @@ static int quota_chk_acq_common(struct obd_device *obd, unsigned int uid, l_wait_event(qctxt->lqc_wait_for_qmaster, check_qm(qctxt), &lwi); CDEBUG(D_QUOTA, "wake up when quota master is back\n"); - lc_watchdog_touch(oti->oti_thread->t_watchdog); + lc_watchdog_touch(oti->oti_thread->t_watchdog, + GET_TIMEOUT(oti->oti_thread->t_svc)); } else { spin_unlock(&qctxt->lqc_lock); } @@ -428,7 +429,8 @@ static int quota_chk_acq_common(struct obd_device *obd, unsigned int uid, struct l_wait_info lwi; if (oti && oti->oti_thread && oti->oti_thread->t_watchdog) - lc_watchdog_touch(oti->oti_thread->t_watchdog); + lc_watchdog_touch(oti->oti_thread->t_watchdog, + GET_TIMEOUT(oti->oti_thread->t_svc)); CDEBUG(D_QUOTA, "rc: %d, count_err: %d\n", rc, count_err++); -- 1.8.3.1