From f1dd92a13d63e495e0bc2c1de9402473b5578fad Mon Sep 17 00:00:00 2001 From: Ben Thompson Date: Wed, 8 Nov 2017 15:27:54 -0600 Subject: [PATCH] MCOL-989: Fix command string missing space and error messages to not reference postConfigure since this can happen under addmodule mcsadmin command. --- oam/oamcpp/liboamcpp.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/oam/oamcpp/liboamcpp.cpp b/oam/oamcpp/liboamcpp.cpp index d0c3764eb..e28e21aa6 100644 --- a/oam/oamcpp/liboamcpp.cpp +++ b/oam/oamcpp/liboamcpp.cpp @@ -8421,12 +8421,12 @@ namespace oam if (WEXITSTATUS(status) != 0 ) { cout << "ERROR: peer probe command failed." << endl; - command = InstallDir + "/bin/remote_command.sh " + DataRedundancyConfigs[pm].pmIpAddr + " " + password + "'stat /var/run/glusterd.pid > /dev/null 2>&1'"; + command = InstallDir + "/bin/remote_command.sh " + DataRedundancyConfigs[pm].pmIpAddr + " " + password + " 'stat /var/run/glusterd.pid > /dev/null 2>&1'"; status = system(command.c_str()); if (WEXITSTATUS(status) != 0 ) { cout << "ERROR: No glusterd process detected at " << DataRedundancyConfigs[pm].pmIpAddr << "." << endl; - cout << " Start and enable glusterd and run postConfigure again." << endl; + cout << " Start and enable glusterd at " << DataRedundancyConfigs[pm].pmIpAddr << "." << endl; } exceptionControl("GLUSTER_ADD", API_FAILURE); } @@ -8565,12 +8565,12 @@ namespace oam if (WEXITSTATUS(status) != 0 ) { cout << "ERROR: peer probe command failed." << endl; - command = InstallDir + "/bin/remote_command.sh " + ipAddress + " " + password + "'stat /var/run/glusterd.pid > /dev/null 2>&1'"; + command = InstallDir + "/bin/remote_command.sh " + ipAddress + " " + password + " 'stat /var/run/glusterd.pid > /dev/null 2>&1'"; status = system(command.c_str()); if (WEXITSTATUS(status) != 0 ) { cout << "ERROR: No glusterd process detected at " << ipAddress << "." << endl; - cout << " Start and enable glusterd and run postConfigure again." << endl; + cout << " Start and enable glusterd at " << ipAddress << "." << endl; } return 1; }