WL#12209 EXTRACT MY.CNF GENERATION TO OWN FUNCTION

Simplify code-logic by extracting my.cnf generation to it's own
function.

Changes are motivated by the need of having a simple way to turn-off
my.cnf generation (needed to support config.ini).
As consequence, this change also enable the simplification of erro
handling code (i.e. closing open files when having error).
Finally, made my.cnf generation logic more lineant by not calling
abort() when settings were added for AP_CLUSTER or AP_ALL and simply
skipping them.

Author: Tiago Alves

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

@@ -19,6 +19,7 @@
 #include <portlib/NdbDir.hpp>
 #include "atrt.hpp"
 
+static bool generate_my_cnf(BaseString mycnf, atrt_config& config);
 static bool create_directory(const char* path);
 
 bool setup_directories(atrt_config& config, int setup) {
@@ -125,6 +126,63 @@ static char* dirname(const char* path) {
 #define pclose _pclose
 #endif
 
+static bool generate_my_cnf(BaseString mycnf, atrt_config& config) {
+  FILE* out = fopen(mycnf.c_str(), "a+");
+  if (out == NULL) {
+    g_logger.error("Failed to open %s for append", mycnf.c_str());
+    return false;
+  }
+
+  time_t now = time(0);
+  fprintf(out, "#\n# Generated by atrt\n");
+  fprintf(out, "# %s\n", ctime(&now));
+
+  for (unsigned i = 0; i < config.m_clusters.size(); i++) {
+    atrt_cluster& cluster = *config.m_clusters[i];
+    printfile(out, cluster.m_options.m_generated, "[mysql_cluster%s]",
+              cluster.m_name.c_str());
+
+    for (unsigned j = 0; j < cluster.m_processes.size(); j++) {
+      atrt_process& proc = *cluster.m_processes[j];
+
+      switch (proc.m_type) {
+        case atrt_process::AP_NDB_MGMD:
+          printfile(out, proc.m_options.m_generated,
+                    "[cluster_config.ndb_mgmd.%d%s]", proc.m_index,
+                    proc.m_cluster->m_name.c_str());
+          break;
+        case atrt_process::AP_NDBD:
+          printfile(out, proc.m_options.m_generated,
+                    "[cluster_config.ndbd.%d%s]", proc.m_index,
+                    proc.m_cluster->m_name.c_str());
+          break;
+        case atrt_process::AP_MYSQLD:
+          printfile(out, proc.m_options.m_generated, "[mysqld.%d%s]",
+                    proc.m_index, proc.m_cluster->m_name.c_str());
+          break;
+        case atrt_process::AP_CLIENT:
+          printfile(out, proc.m_options.m_generated, "[client.%d%s]",
+                    proc.m_index, proc.m_cluster->m_name.c_str());
+          break;
+        case atrt_process::AP_CUSTOM:
+          printfile(out, proc.m_options.m_generated, "[%s.%d%s]",
+                    proc.m_name.c_str(), proc.m_index,
+                    proc.m_cluster->m_name.c_str());
+          break;
+        case atrt_process::AP_NDB_API:
+          // fall-through
+        case atrt_process::AP_ALL:
+          // fall-through
+        case atrt_process::AP_CLUSTER:
+          break;
+      }
+    }
+  }
+
+  fclose(out);
+  return true;
+}
+
 bool setup_files(atrt_config& config, int setup, int sshx) {
   /**
    * 0 = validate
@@ -235,65 +293,18 @@ bool setup_files(atrt_config& config, int setup, int sshx) {
     }
   }
 
-  FILE* out = NULL;
-  bool retval = true;
   if (config.m_generated == false) {
-    g_logger.info("Nothing configured...");
+    g_logger.info("Skipping my.cnf generation...");
   } else {
-    out = fopen(mycnf.c_str(), "a+");
-    if (out == 0) {
-      g_logger.error("Failed to open %s for append", mycnf.c_str());
-      return false;
-    }
-    time_t now = time(0);
-    fprintf(out, "#\n# Generated by atrt\n");
-    fprintf(out, "# %s\n", ctime(&now));
+    bool ok = generate_my_cnf(mycnf, config);
+    if (!ok) return false;
   }
 
   for (unsigned i = 0; i < config.m_clusters.size(); i++) {
     atrt_cluster& cluster = *config.m_clusters[i];
-    if (out) {
-      Properties::Iterator it(&cluster.m_options.m_generated);
-      printfile(out, cluster.m_options.m_generated, "[mysql_cluster%s]",
-                cluster.m_name.c_str());
-    }
-
     for (unsigned j = 0; j < cluster.m_processes.size(); j++) {
       atrt_process& proc = *cluster.m_processes[j];
 
-      if (out) {
-        switch (proc.m_type) {
-          case atrt_process::AP_NDB_MGMD:
-            printfile(out, proc.m_options.m_generated,
-                      "[cluster_config.ndb_mgmd.%d%s]", proc.m_index,
-                      proc.m_cluster->m_name.c_str());
-            break;
-          case atrt_process::AP_NDBD:
-            printfile(out, proc.m_options.m_generated,
-                      "[cluster_config.ndbd.%d%s]", proc.m_index,
-                      proc.m_cluster->m_name.c_str());
-            break;
-          case atrt_process::AP_MYSQLD:
-            printfile(out, proc.m_options.m_generated, "[mysqld.%d%s]",
-                      proc.m_index, proc.m_cluster->m_name.c_str());
-            break;
-          case atrt_process::AP_NDB_API:
-            break;
-          case atrt_process::AP_CLIENT:
-            printfile(out, proc.m_options.m_generated, "[client.%d%s]",
-                      proc.m_index, proc.m_cluster->m_name.c_str());
-            break;
-          case atrt_process::AP_CUSTOM:
-            printfile(out, proc.m_options.m_generated, "[%s.%d%s]",
-                      proc.m_name.c_str(), proc.m_index,
-                      proc.m_cluster->m_name.c_str());
-            break;
-          case atrt_process::AP_ALL:
-          case atrt_process::AP_CLUSTER:
-            abort();
-        }
-      }
-
       /**
        * Create env.sh
        */
@@ -306,8 +317,7 @@ bool setup_files(atrt_config& config, int setup, int sshx) {
         FILE* fenv = fopen(tmp.c_str(), "w+");
         if (fenv == 0) {
           g_logger.error("Failed to open %s for writing", tmp.c_str());
-          retval = false;
-          goto end;
+          return false;
         }
         for (size_t k = 0; env[k]; k++) {
           tmp = env[k];
@@ -364,8 +374,7 @@ bool setup_files(atrt_config& config, int setup, int sshx) {
         FILE* fenv = fopen(tmp.c_str(), "w+");
         if (fenv == 0) {
           g_logger.error("Failed to open %s for writing", tmp.c_str());
-          retval = false;
-          goto end;
+          return false;
         }
         fprintf(fenv, "#!/bin/sh\n");
         fprintf(fenv, "cd %s\n", proc.m_proc.m_cwd.c_str());
@@ -379,12 +388,7 @@ bool setup_files(atrt_config& config, int setup, int sshx) {
     }
   }
 
-end:
-  if (out) {
-    fclose(out);
-  }
-
-  return retval;
+  return true;
 }
 
 static bool create_directory(const char* path) {