WL#12209 SUPPORT ATRT CLUSTER CONFIG VIA .INI FILE

Add option to [atrt] group configuration to enable cluster configuration
to read from config.ini files.
When configuring this option, *.cnf options are read by atrt (to know
which procsses to start), config.ini files existence is checked, and
cluster is started with a config.ini instead of my.cnf.
Note that ndb_mgmd, ndb_api, mysqld, and client can still read settings
from my.cnf.

To choose from cnf or ini files a new [atrt] group setting 'config_type'
was introduced. Possible values are: 'cnf' (default) or 'ini'.
When 'ini' is used, atrt checks that config files for all defined
clusters exist. Config files must have both configuration name and
cluster name as file name, and .ini extension.

Example, for someconf.cnf having:

  [atrt]
  config_type = ini
  clusters = .2node

atrt will check for someconf.2node.ini file in the same path as
someconf.cnf (i.e. $MYSQL_DIR/mysql-test/ndb) and generate appropriate
command-line arguments to start cluster processes using file
config.2node.ini.

When using config.ini files, atrt will not automatically append
settings for ndb, mysqld, or client processes as it does when using
my.cnf files.
Settings generation for my.cnf is as simple as appending them to the end
of the file. For config.ini files, however, we need to parse the file,
detect beginning and ending for each configuration group, handle
duplicate settings, and only then add settings.
To make matters worse, mysqld, clients, custom processes all read
my.cnf. Generating my.cnf configurations could also make config.ini
settings to be inconsistent.
Because of all that, when using config.ini files both .cnf and .ini
files must include all settings:
 * define ports for all processes (overriding atrt's baseport command
   line argument). This applies to [cluster_config.ndb_mgmd.NSUFFIX] and
   [mysqldSUFFIX] and [clientSUFFIX] configuration options.
 * define mysqld datadir (can be specified using CHOOSE_dir placeholder)
 * define ndb-connectstring under [mysql_cluster] configuration group
 * define any other [mysqld] and [client] settings whenever appropriate
   (applies to .atrt cluster as well).
 * define [ndb] FileSystemPath setting.
 * enable [atrt] configuration group's full qualified path names

An minimal configuration example someconf.cnf is:

[atrt]
basedir = CHOOSE_dir  # base path replaced by autotest-run.sh
clusters = .2node  # cluster name suffix
fqpn = 1  # use full qualified path names
config_type = ini  # configure cluster using .ini file
mysqld = CHOOSE_host1  # configure atrt database under .atrt cluster
mt = 2  # Use ndbmt (0 = never, 1 = round-robin, 2 = only)
fix-nodeid = 0  # management server decides NodeId order

[cluster_config.2node]
ndb_mgmd=CHOOSE_host1
ndbd=CHOOSE_host1,CHOOSE_host1
mysqld=CHOOSE_host1
ndbapi=CHOOSE_host1,CHOOSE_host1,CHOOSE_host1

[cluster_config.ndb_mgmd.1.2node]
PortNumber=14000

[cluster_config.ndb_mgmd.2.2node]
PortNumber=14001

[mysqld.1.2node]
port=14002
datadir=CHOOSE_dir/cluster.2node/mysqld.1/data

[client.1.2node]
host=CHOOSE_host1  # must match what was defined in [cluster_config]
port=14002  # must match what was defined in [mysqld.1.2node]

Then, someconf.2node.ini must contain:

[ndb default]
NoOfReplicas=2
DataMemory=512M
BackupMemory=64M

[ndb_mgmd]
NodeId=1  # atrt starts defining id numbers from ndb_mgmd
HostName=CHOOSE_host1  # must match definition in cluster_config
PortNumber=14000  # must match definition in cluster_config.ndb_mgmd.1

[ndb_mgmd]
NodeId=2
HostName=CHOOSE_host1
PortNumber=14001

[ndbd]
NodeId=3  # Sequential number after all ndb_mgmd ids
HostName=CHOOSE_host1  # must match definiton in cluster_config
FileSystemPath=CHOOSE_dir/cluster.2node/ndbd.1

[ndbd]
NodeId=4
HostName=CHOOSE_host1
FileSystemPath=CHOOSE_dir/cluster.2node/ndbd.2

Author: Tiago Alves

storage/ndb/test/run-test/atrt.hpp

@@ -106,6 +106,7 @@ struct atrt_cluster {
 
 struct atrt_config {
   bool m_generated;
+  enum { CNF, INI } m_config_type;
   BaseString m_key;
   BaseString m_replication;
   BaseString m_site;

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

@@ -242,6 +242,33 @@ bool setup_files(atrt_config& config, int setup, int sshx) {
     }
   }
 
+  if (config.m_config_type == atrt_config::INI) {
+    for (unsigned i = 0; i < config.m_clusters.size(); i++) {
+      atrt_cluster& cluster = *config.m_clusters[i];
+      const char* cluster_name = cluster.m_name.c_str();
+
+      if (strcmp(cluster_name, ".atrt") == 0) {
+        continue;
+      }
+
+      BaseString dst_config_ini;
+      dst_config_ini.assfmt("%s/config%s.ini", g_basedir, cluster_name);
+      to_native(dst_config_ini);
+
+      if (!delete_file_if_exists(dst_config_ini.c_str())) {
+        return false;
+      }
+
+      BaseString src_config_ini;
+      src_config_ini.assfmt("%s/config%s.ini", g_cwd, cluster_name);
+      to_native(src_config_ini);
+
+      if (!copy_file(src_config_ini.c_str(), dst_config_ini.c_str())) {
+        return false;
+      }
+    }
+  }
+
   if (setup == 2 || config.m_generated) {
     bool use_mysqld = (g_mysql_install_db_bin_path == NULL);
     if (!use_mysqld) {
@@ -319,7 +346,9 @@ bool setup_files(atrt_config& config, int setup, int sshx) {
     }
   }
 
-  if (config.m_generated == false) {
+  bool skip_my_cnf_generation =
+      config.m_config_type == atrt_config::INI || config.m_generated == false;
+  if (skip_my_cnf_generation) {
     g_logger.info("Skipping my.cnf generation...");
   } else {
     bool ok = generate_my_cnf(mycnf, config);

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

@@ -70,6 +70,7 @@ const char *g_prefix = NULL;
 const char *g_prefix0 = NULL;
 const char *g_prefix1 = NULL;
 const char *g_clusters = 0;
+const char *g_config_type = NULL;  // "cnf" or "ini"
 const char *g_site = NULL;
 BaseString g_replicate;
 const char *save_file = 0;
@@ -104,6 +105,7 @@ static struct {
 const char *g_search_path[] = {"bin", "libexec",   "sbin", "scripts",
                                "lib", "lib/mysql", 0};
 static bool find_binaries();
+static bool find_config_ini_files();
 
 static struct my_option g_options[] = {
     {"help", '?', "Display this help and exit.", (uchar **)&g_help,
@@ -114,6 +116,8 @@ static struct my_option g_options[] = {
      REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
     {"clusters", 256, "Cluster", (uchar **)&g_clusters, (uchar **)&g_clusters,
      0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
+    {"config-type", 256, "cnf (default) or ini", (uchar **)&g_config_type,
+     (uchar **)&g_config_type, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
     {"mysqld", 256, "atrt mysqld", (uchar **)&g_mysqld_host,
      (uchar **)&g_mysqld_host, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
     {"replicate", 1024, "replicate", (uchar **)&g_dummy, (uchar **)&g_dummy, 0,
@@ -202,6 +206,17 @@ int main(int argc, char **argv) {
     goto end;
   }
 
+  g_config.m_config_type = atrt_config::CNF;
+  if (g_config_type != NULL && strcmp(g_config_type, "ini") == 0) {
+    g_logger.info("Using config.ini for cluster configuration");
+    g_config.m_config_type = atrt_config::INI;
+
+    if (!find_config_ini_files()) {
+      g_logger.critical("Failed to find required config.ini files");
+      goto end;
+    }
+  }
+
   g_config.m_generated = false;
   g_config.m_replication = g_replicate;
   if (!setup_config(g_config, g_mysqld_host)) {
@@ -1659,6 +1674,29 @@ static bool find_binaries() {
   return ok;
 }
 
+static bool find_config_ini_files() {
+  g_logger.info("Locating config.ini files...");
+
+  BaseString tmp(g_clusters);
+  Vector<BaseString> clusters;
+  tmp.split(clusters, ",");
+
+  bool found = true;
+  for (unsigned int i = 0; i < clusters.size(); i++) {
+    BaseString config_ini_path(g_cwd);
+    const char *cluster_name = clusters[i].c_str();
+    config_ini_path.appfmt("%sconfig%s.ini", PATH_SEPARATOR, cluster_name);
+    to_native(config_ini_path);
+
+    if (!exists_file(config_ini_path.c_str())) {
+      g_logger.critical("Failed to locate '%s'", config_ini_path.c_str());
+      found = false;
+    }
+  }
+
+  return found;
+}
+
 template class Vector<Vector<SimpleCpcClient::Process> >;
 template class Vector<atrt_host *>;
 template class Vector<atrt_cluster *>;

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

@@ -506,39 +506,55 @@ static bool load_process(atrt_config& config, atrt_cluster& cluster,
   switch (type) {
     case atrt_process::AP_NDB_MGMD: {
       proc.m_proc.m_name.assfmt("%u-%s", proc_no, "ndb_mgmd");
+      proc.m_proc.m_cwd.assfmt("%sndb_mgmd.%u", dir.c_str(), proc.m_index);
       proc.m_proc.m_path.assign(g_ndb_mgmd_bin_path);
+      proc.m_proc.m_env.appfmt(" MYSQL_GROUP_SUFFIX=%s",
+                               cluster.m_name.c_str());
       proc.m_proc.m_args.assfmt("--defaults-file=%s/my.cnf",
                                 proc.m_host->m_basedir.c_str());
       proc.m_proc.m_args.appfmt(" --defaults-group-suffix=%s",
                                 cluster.m_name.c_str());
-      proc.m_proc.m_args.append(" --nodaemon --mycnf");
+
+      switch (config.m_config_type) {
+        case atrt_config::CNF: {
+          proc.m_proc.m_args.append(" --mycnf");
+          break;
+        }
+        case atrt_config::INI: {
+          proc.m_proc.m_args.assfmt("--config-file=%s/config%s.ini",
+                                    proc.m_host->m_basedir.c_str(),
+                                    cluster.m_name.c_str());
+          break;
+        }
+      }
+      proc.m_proc.m_args.append(" --nodaemon");
       proc.m_proc.m_args.appfmt(" --ndb-nodeid=%u", proc.m_nodeid);
-      proc.m_proc.m_cwd.assfmt("%sndb_mgmd.%u", dir.c_str(), proc.m_index);
       proc.m_proc.m_args.appfmt(" --configdir=%s", proc.m_proc.m_cwd.c_str());
-      proc.m_proc.m_env.appfmt(" MYSQL_GROUP_SUFFIX=%s",
-                               cluster.m_name.c_str());
       break;
     }
     case atrt_process::AP_NDBD: {
+      proc.m_proc.m_name.assfmt("%u-%s", proc_no, "ndbd");
+      proc.m_proc.m_cwd.assfmt("%sndbd.%u", dir.c_str(), proc.m_index);
+
       if (g_mt == 0 || (g_mt == 1 && ((g_mt_rr++) & 1) == 0) ||
           g_ndbmtd_bin_path == 0) {
         proc.m_proc.m_path.assign(g_ndbd_bin_path);
       } else {
         proc.m_proc.m_path.assign(g_ndbmtd_bin_path);
       }
 
-      proc.m_proc.m_name.assfmt("%u-%s", proc_no, "ndbd");
+      proc.m_proc.m_env.appfmt(" MYSQL_GROUP_SUFFIX=%s",
+                               cluster.m_name.c_str());
+
       proc.m_proc.m_args.assfmt("--defaults-file=%s/my.cnf",
                                 proc.m_host->m_basedir.c_str());
       proc.m_proc.m_args.appfmt(" --defaults-group-suffix=%s",
                                 cluster.m_name.c_str());
       proc.m_proc.m_args.append(" --nodaemon -n");
+
       if (!g_restart) proc.m_proc.m_args.append(" --initial");
       if (g_fix_nodeid)
         proc.m_proc.m_args.appfmt(" --ndb-nodeid=%u", proc.m_nodeid);
-      proc.m_proc.m_cwd.assfmt("%sndbd.%u", dir.c_str(), proc.m_index);
-      proc.m_proc.m_env.appfmt(" MYSQL_GROUP_SUFFIX=%s",
-                               cluster.m_name.c_str());
       break;
     }
     case atrt_process::AP_MYSQLD: {