BUG#91682 FIXES ATRT CUSTOM PROCS PORT SETTINGS

Fixes atrt custom processes port arguments/configuration generation by
attempting to load them before generation.

When using config.ini files, user is expected to manually configure all
settings for all processes. For custom processes, specifying port
settings had no effect and ATRT was automatically generating ports.
Added logic to ensure that when port options are specified, those are
loaded and the values used when generating command line arguments.

atrt current implementation is a bit strict. Code was already available
to load and generation options for processes, but only if those options
are mandatory.
In case of custom processes, port options is configured via
[cluster_deployment] generate-port setting, which doesn't exactly fit
how atrt has been implemented.

Required changes were:
 * when loading a custom process, load any setting that has been
   specified in it's own configuration group
 * enable f_options "--port" configuration for custom processes
 * disable custom processes from pr_proc_options logic (which
   automatically generates --port settings if missing)
 * disable custom processes from pr_proc_check logic (which enforces
   the existence of all settings configured in f_options).
 * modified logic in load_deployment_options_for_process to skip
   settings port generation if port has been configured.
 * fix logic to generate custom processes CONNECTSTRING environment
   variable to add port number in case port has been loaded (higher
   precedence) or generated (lower precedence).

Author: Tiago Alves

storage/ndb/test/run-test/setup.cpp

@@ -56,7 +56,10 @@ static struct proc_option f_options[] = {
     {"--PortNumber=", atrt_process::AP_NDB_MGMD, 0},
     {"--datadir=", atrt_process::AP_MYSQLD, 0},
     {"--socket=", atrt_process::AP_MYSQLD | atrt_process::AP_CLIENT, 0},
-    {"--port=", atrt_process::AP_MYSQLD | atrt_process::AP_CLIENT, 0},
+    {"--port=",
+     atrt_process::AP_MYSQLD | atrt_process::AP_CLIENT |
+         atrt_process::AP_CUSTOM,
+     0},
     {"--host=", atrt_process::AP_CLIENT, 0},
     {"--server-id=", atrt_process::AP_MYSQLD, PO_REP},
     {"--log-bin", atrt_process::AP_MYSQLD, PO_REP_MASTER},
@@ -344,14 +347,19 @@ bool load_deployment_options_for_process(atrt_cluster& cluster,
 
   proc.m_proc.m_path.assign(bin_path);
 
-  if (args) proc.m_proc.m_args.assign(args);
+  if (args) {
+    proc.m_proc.m_args.appfmt(" %s", args);
+  }
 
-  if (generate_port) {
+  const char* port_arg = "--port=";
+  const char* val;
+  if (generate_port && !proc.m_options.m_loaded.get(port_arg, &val)) {
     BaseString portno;
     portno.assfmt("%d", g_baseport + proc.m_procno);
 
-    proc.m_proc.m_args.appfmt(" --port=%s", portno.c_str());
-    proc.m_options.m_generated.put("--port", portno.c_str());
+    proc.m_proc.m_args.appfmt(" %s%s", port_arg, portno.c_str());
+    proc.m_options.m_generated.put(port_arg, portno.c_str());
+    proc.m_options.m_loaded.put(port_arg, portno.c_str());
   }
 
   return true;
@@ -485,6 +493,12 @@ static bool load_process(atrt_config& config, atrt_cluster& cluster,
       if (g_fix_nodeid) proc.m_nodeid = cluster.m_next_nodeid++;
       break;
     case atrt_process::AP_CUSTOM:
+      buf[0].assfmt("%s%s", proc.m_name.c_str(), cluster.m_name.c_str());
+      groups[0] = buf[0].c_str();
+
+      buf[1].assfmt("%s.%u%s", proc.m_name.c_str(), idx,
+                    cluster.m_name.c_str());
+      groups[1] = buf[1].c_str();
       break;
     default:
       g_logger.critical("Unhandled process type: %d", type);
@@ -602,6 +616,12 @@ static bool load_process(atrt_config& config, atrt_cluster& cluster,
       proc.m_proc.m_name.assfmt("%u-%s", proc_no, proc.m_name.c_str());
       proc.m_proc.m_cwd.assfmt("%s%s.%u", dir.c_str(), proc.m_name.c_str(),
                                proc.m_index);
+
+      const char* port_arg = "--port=";
+      const char* val;
+      if (proc.m_options.m_loaded.get(port_arg, &val)) {
+        proc.m_proc.m_args.assfmt("%s%s", port_arg, val);
+      }
       break;
     }
     case atrt_process::AP_ALL:
@@ -671,14 +691,16 @@ static bool pr_set_customprocs_connectstring(Properties&, proc_rule_ctx&, int);
 static proc_rule f_rules[] = {
     {atrt_process::AP_CLUSTER, pr_check_features, 0},
     {atrt_process::AP_MYSQLD, pr_check_replication, 0},
-    {(atrt_process::AP_ALL & ~atrt_process::AP_CLIENT), pr_proc_options,
-     ~(PO_REP | PO_NDB)},
-    {(atrt_process::AP_ALL & ~atrt_process::AP_CLIENT), pr_proc_options,
-     PO_REP},
+    {(atrt_process::AP_ALL & ~atrt_process::AP_CLIENT &
+      ~atrt_process::AP_CUSTOM),
+     pr_proc_options, ~(PO_REP | PO_NDB)},
+    {(atrt_process::AP_ALL & ~atrt_process::AP_CLIENT &
+      ~atrt_process::AP_CUSTOM),
+     pr_proc_options, PO_REP},
     {atrt_process::AP_CLIENT, pr_fix_client, 0},
     {atrt_process::AP_CLUSTER, pr_fix_ndb_connectstring, 0},
     {atrt_process::AP_MYSQLD, pr_set_ndb_connectstring, 0},
-    {atrt_process::AP_ALL, pr_check_proc, 0},
+    {atrt_process::AP_ALL & ~atrt_process::AP_CUSTOM, pr_check_proc, 0},
     {atrt_process::AP_CLUSTER, pr_set_customprocs_connectstring, 0},
     {0, 0, 0}};
 
@@ -1063,8 +1085,10 @@ static bool pr_set_customprocs_connectstring(Properties& props,
                          proc->m_host->m_hostname.c_str());
     }
 
+    const char* port_arg = "--port=";
     const char* portno;
-    if (proc->m_options.m_generated.get("--port", &portno)) {
+    if (proc->m_options.m_loaded.get(port_arg, &portno) ||
+        proc->m_options.m_generated.get(port_arg, &portno)) {
       BaseString str;
       str.assfmt(":%s", portno);
       connectstrings.append(proc->m_name.c_str(), str.c_str());