Commit 7992ae42 authored by unknown's avatar unknown

wl1292 - minor fixes


ndb/test/run-test/main.cpp:
  Remove LD_LIBRARY_PATH setting as it's compiled into binary
  Removed node id from NDB_CONNECTSTRING
parent eebf8ff5
...@@ -211,7 +211,7 @@ started: ...@@ -211,7 +211,7 @@ started:
(result == 0 ? "OK" : "FAILED"), result); (result == 0 ? "OK" : "FAILED"), result);
if(g_report_file != 0){ if(g_report_file != 0){
fprintf(g_report_file, "%s %s ; %d ; %d ; %d\n", fprintf(g_report_file, "%s %s ; %d ; %d ; %ld\n",
test_case.m_command.c_str(), test_case.m_command.c_str(),
test_case.m_args.c_str(), test_case.m_args.c_str(),
test_no, result, elapsed); test_no, result, elapsed);
...@@ -447,7 +447,6 @@ setup_config(atrt_config& config){ ...@@ -447,7 +447,6 @@ setup_config(atrt_config& config){
proc.m_proc.m_owner = "atrt"; proc.m_proc.m_owner = "atrt";
proc.m_proc.m_group = "group"; proc.m_proc.m_group = "group";
proc.m_proc.m_cwd.assign(dir).append("/run/"); proc.m_proc.m_cwd.assign(dir).append("/run/");
proc.m_proc.m_env.assfmt("LD_LIBRARY_PATH=%s/lib/mysql", dir.c_str());
proc.m_proc.m_stdout = "log.out"; proc.m_proc.m_stdout = "log.out";
proc.m_proc.m_stderr = "2>&1"; proc.m_proc.m_stderr = "2>&1";
proc.m_proc.m_runas = proc.m_host->m_user; proc.m_proc.m_runas = proc.m_host->m_user;
...@@ -460,7 +459,7 @@ setup_config(atrt_config& config){ ...@@ -460,7 +459,7 @@ setup_config(atrt_config& config){
proc.m_proc.m_path.assign(dir).append("/libexec/ndb_mgmd"); proc.m_proc.m_path.assign(dir).append("/libexec/ndb_mgmd");
proc.m_proc.m_args = "-n -c initconfig.txt"; proc.m_proc.m_args = "-n -c initconfig.txt";
proc.m_proc.m_cwd.appfmt("%d.ndb_mgmd", index); proc.m_proc.m_cwd.appfmt("%d.ndb_mgmd", index);
connect_string.appfmt(";host=%s:%d", connect_string.appfmt("host=%s:%d;",
proc.m_hostname.c_str(), proc.m_ndb_mgm_port); proc.m_hostname.c_str(), proc.m_ndb_mgm_port);
} else if(split1[0] == "ndb"){ } else if(split1[0] == "ndb"){
proc.m_type = atrt_process::NDB_DB; proc.m_type = atrt_process::NDB_DB;
...@@ -502,8 +501,8 @@ setup_config(atrt_config& config){ ...@@ -502,8 +501,8 @@ setup_config(atrt_config& config){
// Setup connect string // Setup connect string
for(size_t i = 0; i<config.m_processes.size(); i++){ for(size_t i = 0; i<config.m_processes.size(); i++){
config.m_processes[i].m_proc.m_env.appfmt(" NDB_CONNECTSTRING=nodeid=%d%s", config.m_processes[i].m_proc.m_env.assfmt("NDB_CONNECTSTRING=%s",
i+1, connect_string.c_str()); connect_string.c_str());
} }
end: end:
...@@ -791,6 +790,10 @@ update_status(atrt_config& config, int){ ...@@ -791,6 +790,10 @@ update_status(atrt_config& config, int){
proc.m_proc.m_id, proc.m_proc.m_id,
proc.m_hostname.c_str(), proc.m_hostname.c_str(),
proc.m_proc.m_path.c_str()); proc.m_proc.m_path.c_str());
for(size_t j = 0; j<h_procs.size(); j++){
g_logger.error("found: %d %s", h_procs[j].m_id,
h_procs[j].m_path.c_str());
}
return false; return false;
} }
} }
......
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