70 lines
1.9 KiB
Diff
70 lines
1.9 KiB
Diff
|
From e722c69cef883af1f7d60cbb2708f0092dbf2ab0 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Nir Soffer <nsoffer@redhat.com>
|
||
|
|
Date: Mon, 30 Nov 2020 15:02:33 -0600
|
||
|
|
Subject: [PATCH] config: Add max_worker_threads
|
||
|
|
|
||
|
|
Concurrent async add_lockspace calls are limited by the number of worker
|
||
|
|
threads. Using larger number of worker threads shorten the time to add
|
||
|
|
many locksapces in large setups.
|
||
|
|
|
||
|
|
Previously this value could be modified only via the command line. Now
|
||
|
|
it can be modified via the sanlock configuration file for easier
|
||
|
|
deployment.
|
||
|
|
|
||
|
|
Buglink: https://bugzilla.redhat.com/1902468
|
||
|
|
Signed-off-by: Nir Soffer <nsoffer@redhat.com>
|
||
|
|
---
|
||
|
|
src/main.c | 7 +++++++
|
||
|
|
src/sanlock.8 | 5 +++++
|
||
|
|
src/sanlock.conf | 3 +++
|
||
|
|
3 files changed, 15 insertions(+)
|
||
|
|
|
||
|
|
diff --git a/src/main.c b/src/main.c
|
||
|
|
index e2901f3667a9..63d8cffd036c 100644
|
||
|
|
--- a/src/main.c
|
||
|
|
+++ b/src/main.c
|
||
|
|
@@ -2877,6 +2877,13 @@ static void read_config_file(void)
|
||
|
|
} else {
|
||
|
|
log_error("ignore unknown max_sectors_kb %s", str);
|
||
|
|
}
|
||
|
|
+
|
||
|
|
+ } else if (!strcmp(str, "max_worker_threads")) {
|
||
|
|
+ get_val_int(line, &val);
|
||
|
|
+ if (val < DEFAULT_MIN_WORKER_THREADS)
|
||
|
|
+ val = DEFAULT_MIN_WORKER_THREADS;
|
||
|
|
+ com.max_worker_threads = val;
|
||
|
|
+
|
||
|
|
}
|
||
|
|
}
|
||
|
|
|
||
|
|
diff --git a/src/sanlock.8 b/src/sanlock.8
|
||
|
|
index a9126a484cf4..2021b4ac2f5a 100644
|
||
|
|
--- a/src/sanlock.8
|
||
|
|
+++ b/src/sanlock.8
|
||
|
|
@@ -1372,6 +1372,11 @@ The io timeout to use when initializing ondisk lease structures
|
||
|
|
for a lockspace or resource. This timeout is not used as a part
|
||
|
|
of either lease algorithm (as the standard io_timeout is.)
|
||
|
|
|
||
|
|
+.IP \[bu] 2
|
||
|
|
+max_worker_threads = <num>
|
||
|
|
+.br
|
||
|
|
+See -t
|
||
|
|
+
|
||
|
|
.SH SEE ALSO
|
||
|
|
.BR wdmd (8)
|
||
|
|
|
||
|
|
diff --git a/src/sanlock.conf b/src/sanlock.conf
|
||
|
|
index 9b78e5cff236..2909a9cbc9d6 100644
|
||
|
|
--- a/src/sanlock.conf
|
||
|
|
+++ b/src/sanlock.conf
|
||
|
|
@@ -66,3 +66,6 @@
|
||
|
|
#
|
||
|
|
# write_init_io_timeout = <seconds>
|
||
|
|
# command line: n/a
|
||
|
|
+#
|
||
|
|
+# max_worker_threads = 8
|
||
|
|
+# command line: -t 8
|
||
|
|
--
|
||
|
|
2.7.5
|
||
|
|
|