From: Martin Schwenke <martin@meltin.net>
Date: Thu, 4 Apr 2019 07:21:49 +0000 (+1100)
Subject: Revert "ctdb-scripts: Do not "correct" number of nfsd threads when it is 0"
X-Git-Tag: tdb-1.4.1~440
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=10291d91f2a087ff959676f2e2a04b41ae5afd68;p=thirdparty%2Fsamba.git

Revert "ctdb-scripts: Do not "correct" number of nfsd threads when it is 0"

I thought this was being triggered during automated testing.
However, it appears that a poor choice of fixed ports for NFS RPC
services was the real problem.  Revert, since the original behaviour
may be useful.

This reverts commit f1a1c300e192d43f5c9faf9450ffbf16341a2661.

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
---

diff --git a/ctdb/config/nfs-linux-kernel-callout b/ctdb/config/nfs-linux-kernel-callout
index 868f3279cf2..def69a04649 100755
--- a/ctdb/config/nfs-linux-kernel-callout
+++ b/ctdb/config/nfs-linux-kernel-callout
@@ -313,10 +313,8 @@ nfs_check_thread_count ()
 
     # Intentionally not arithmetic comparison - avoids extra errors
     # when above read fails in an unexpected way...
-    if [ "$_running_threads" != "0" ] && \
-	       [ "$_running_threads" != "$_configured_threads" ] ; then
-	printf 'Attempting to correct number of nfsd threads from %s to %s\n' \
-	       "$_running_threads" "$_configured_threads"
+    if [ "$_running_threads" != "$_configured_threads" ] ; then
+	echo "Attempting to correct number of nfsd threads from ${_running_threads} to ${_configured_threads}"
 	echo "$_configured_threads" >"$_threads_file"
     fi
 }