From 7c250c8f3855b33c20ac84cd3210cb7f4a30f848 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Tue, 19 Mar 2024 08:16:17 +0200
Subject: Implement auxiliary machine support in bbot-agent

---
 bbot/agent/agent.cli | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

(limited to 'bbot/agent/agent.cli')

diff --git a/bbot/agent/agent.cli b/bbot/agent/agent.cli
index 060cba0..23765cf 100644
--- a/bbot/agent/agent.cli
+++ b/bbot/agent/agent.cli
@@ -119,7 +119,7 @@ namespace bbot
       "<num>",
       "Toolchain number, 1 by default. If agents are running for several
        toolchains, then each of them should have a unique toolchain number
-       between 1 and 99. This number is used as an offset for network ports,
+       between 1 and 9. This number is used as an offset for network ports,
        interfaces, etc."
     }
 
@@ -195,7 +195,7 @@ namespace bbot
       "Amount of RAM (in KiB) to use for the build machine, 4GiB by default."
     }
 
-    size_t --auxiliary-ram
+    size_t --auxiliary-ram = 0
     {
       "<num>",
       "Amount of RAM (in KiB) to use for auxiliary machines. To disable
@@ -251,28 +251,35 @@ namespace bbot
     }
 
     // Low 23401+, 23501+, 23601+, etc., all look good collision-wise with
-    // with anything useful.
+    // anything useful.
     //
     uint16_t --tftp-port = 23400
     {
       "<num>",
       "TFTP server port base, 23400 by default. The actual port is calculated
-       by adding an offset calculated based on the toolchain and instance
-       numbers."
+       by adding an offset calculated based on the toolchain, instance, and
+       machine numbers."
     }
 
     size_t --bootstrap-startup = 300
     {
       "<sec>",
-      "Maximum number of seconds to wait for machine bootstrap startup,
+      "Maximum number of seconds to wait for build machine bootstrap startup,
        300 (5 minutes) by default."
     }
 
     size_t --bootstrap-timeout = 3600
     {
       "<sec>",
-      "Maximum number of seconds to wait for machine bootstrap completion,
-       3600 (60 minutes) by default."
+      "Maximum number of seconds to wait for build machine bootstrap
+       completion, 3600 (60 minutes) by default."
+    }
+
+    size_t --bootstrap-auxiliary = 900
+    {
+      "<sec>",
+      "Maximum number of seconds to wait for auxiliary machine bootstrap
+       completion, 900 (15 minutes) by default."
     }
 
     size_t --bootstrap-retries = 2
@@ -286,7 +293,7 @@ namespace bbot
     {
       "<sec>",
       "Maximum number of seconds to wait for build startup, 240 (4 minutes) by
-       default."
+       default. This value is used for both build and auxiliary machines."
     }
 
     size_t --build-timeout = 5400
-- 
cgit v1.1