Increase the watchdog factors

Under a heavy IO load it is not uncommon to see service threads take 200-450 seconds to complete due to slow journal starts. This patch increases the watchdog factors to the point where we should only get watchdogs for real deadlocks.
LLNL · May 3, 2010 · 7cede76 · 7cede76
1 parent ea8bae5
commit 7cede76
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/lustre/ldlm/ldlm_lockd.c b/lustre/ldlm/ldlm_lockd.c
@@ -2144,7 +2144,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, 2,
+                                LDLM_CB_REPLY_PORTAL, 6,
                                 ldlm_callback_handler, "ldlm_cbd",
                                 ldlm_svc_proc_dir, NULL,
                                 ldlm_min_threads, ldlm_max_threads,
@@ -2158,7 +2158,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, 6,
+                                LDLM_CANCEL_REPLY_PORTAL, 18,
                                 ldlm_cancel_handler, "ldlm_canceld",
                                 ldlm_svc_proc_dir, NULL,
                                 ldlm_min_threads, ldlm_max_threads,

diff --git 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 2
+#define OSS_SERVICE_WATCHDOG_FACTOR 6
 
 /*
  * tunables for per-thread page pool (bug 5137)