(couchdb) 01/01: implement this same as maybe_boot_clouseau

[rn...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

rnewson pushed a commit to branch fix-dev-run-setup-config-2
in repository https://gitbox.apache.org/repos/asf/couchdb.git

commit 47bfc7f06fb6f28a1d4145cf8f5098699c845854
Author: Robert Newson <rn...@apache.org>
AuthorDate: Wed Jan 10 22:43:45 2024 +0000

    implement this same as maybe_boot_clouseau
---
 dev/run | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/dev/run b/dev/run
index 80137baa3..4538e701e 100755
--- a/dev/run
+++ b/dev/run
@@ -369,8 +369,7 @@ def setup_configs(ctx):
         write_config(ctx, node, env)
         write_locald_configs(ctx, node, env)
     generate_haproxy_config(ctx)
-    if env["nouveau_enable"] == "true":
-        generate_nouveau_config(ctx)
+    generate_nouveau_config(ctx)
 
 
 def write_locald_configs(ctx, node, env):
@@ -414,6 +413,8 @@ def generate_haproxy_config(ctx):
 
 
 def generate_nouveau_config(ctx):
+    if not ctx["with_nouveau"]:
+        return
     src = os.path.join(ctx["rootdir"], "rel", "nouveau.yaml")
     tgt = os.path.join(ctx["devdir"], "lib", "nouveau.yaml")
 
@@ -532,9 +533,12 @@ def boot_haproxy(ctx):
     return sp.Popen(cmd, stdin=sp.PIPE, stdout=log, stderr=sp.STDOUT, env=env)
 
 
+def maybe_boot_nouveau(ctx):
+    if ctx["with_nouveau"]:
+        return boot_clouseau(ctx)
+
+
 def boot_nouveau(ctx):
-    if not ctx["with_nouveau"]:
-        return
     config = os.path.join(ctx["devdir"], "lib", "nouveau.yaml")
     cmd = [
         "./gradlew",
@@ -901,7 +905,7 @@ def boot_nodes(ctx):
     haproxy_proc = boot_haproxy(ctx)
     if haproxy_proc is not None:
         ctx["procs"].append(haproxy_proc)
-    nouveau_proc = boot_nouveau(ctx)
+    nouveau_proc = maybe_boot_nouveau(ctx)
     if nouveau_proc is not None:
         ctx["procs"].append(nouveau_proc)
     for idx in [(i + ctx["node_number"]) for i in range(ctx["N"])]: