Commit 0887c3bc authored by unknown's avatar unknown

ndb - new atrt

    Fix bug when restarting cluster after failure
      (fs was not cleared)
    Fix cosmetic bug that made rsync be run several times when gathering result


storage/ndb/test/run-test/main.cpp:
  Fix bug when restarting cluster after failure
    (fs was not cleared)
  Fix cosmetic bug that made rsync be run several times when gathering result
parent 9197d6b8
...@@ -239,11 +239,8 @@ main(int argc, char ** argv) ...@@ -239,11 +239,8 @@ main(int argc, char ** argv)
if(!stop_processes(g_config, ~0)) if(!stop_processes(g_config, ~0))
goto end; goto end;
if (!setup_directories(g_config, 2)) if(!setup_hosts(g_config))
goto end; goto end;
if (!setup_files(g_config, 2, 1))
goto end;
if (!start(g_config, p_ndb | p_servers)) if (!start(g_config, p_ndb | p_servers))
goto end; goto end;
...@@ -1070,14 +1067,14 @@ gather_result(atrt_config& config, int * result){ ...@@ -1070,14 +1067,14 @@ gather_result(atrt_config& config, int * result){
tmp.appfmt(" %s:%s/*", tmp.appfmt(" %s:%s/*",
config.m_hosts[i]->m_hostname.c_str(), config.m_hosts[i]->m_hostname.c_str(),
config.m_hosts[i]->m_basedir.c_str()); config.m_hosts[i]->m_basedir.c_str());
}
g_logger.debug("system(%s)", tmp.c_str());
const int r1 = system(tmp.c_str()); g_logger.debug("system(%s)", tmp.c_str());
if(r1 != 0) const int r1 = system(tmp.c_str());
{ if(r1 != 0)
g_logger.critical("Failed to gather result!"); {
return false; g_logger.critical("Failed to gather result!");
} return false;
} }
g_logger.debug("system(%s)", g_analyze_progname); g_logger.debug("system(%s)", g_analyze_progname);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment