hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Always use service restart for startup

Browse Source 
By starting MaxScale with `service restart maxscale`, the start() function
is idempotent: MaxScale is started from a stopped state.
This commit is contained in:
Markus Mäkelä
2018-11-05 14:00:57 +02:00
parent eb1bc0b768
commit a53dbeec57
2 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
maxscale-system-test/maxscales.cpp
View File

@ -230,13 +230,6 @@ int Maxscales::restart_maxscale(int m)
return res; return res;
} }
int Maxscales::start_maxscale(int m)
{
int res = ssh_node(m, "service maxscale start", true);
fflush(stdout);
return res;
}
int Maxscales::stop_maxscale(int m) int Maxscales::stop_maxscale(int m)
{ {
int res = ssh_node(m, "service maxscale stop", true); int res = ssh_node(m, "service maxscale stop", true);
@ -244,7 +237,6 @@ int Maxscales::stop_maxscale(int m)
return res; return res;
} }
int Maxscales::execute_maxadmin_command(int m, const char* cmd) int Maxscales::execute_maxadmin_command(int m, const char* cmd)
{ {
return ssh_node_f(m, true, "maxadmin %s", cmd); return ssh_node_f(m, true, "maxadmin %s", cmd);

7
maxscale-system-test/maxscales.h
View File

@ -250,9 +250,12 @@ public:
} }
/** /**
* @brief start_maxscale Issues 'service maxscale start' command * @brief alias for restart_maxscale
*/ */
int start_maxscale(int m = 0); int start_maxscale(int m = 0)
{
return restart_maxscale(m);
}
int start(int m = 0) int start(int m = 0)
{ {
return start_maxscale(m); return start_maxscale(m);