Use rabbitmqctl to command secondary node

Not make.

(cherry picked from commit 41635af)

Conflicts:
	src/test/java/com/rabbitmq/tools/Host.java

Author: acogoluegnes

src/test/java/com/rabbitmq/client/test/functional/ClusteredTestBase.java

@@ -124,10 +124,15 @@ public void closeConnection() throws IOException {
     }
 
     protected void stopSecondary() throws IOException {
-        Host.invokeMakeTarget("stop-rabbit-on-node RABBITMQ_NODENAME=\'" + Host.nodenameB() + "\'");
+        Host.executeCommand(Host.rabbitmqctlCommand() +
+                " -n \'" + Host.nodenameB() + "\'" +
+                " stop_app");
     }
 
     protected void startSecondary() throws IOException {
-        Host.invokeMakeTarget("start-rabbit-on-node RABBITMQ_NODENAME=\'" + Host.nodenameB() + "\'");
+        Host.executeCommand(Host.rabbitmqctlCommand() +
+                " -n \'" + Host.nodenameB() + "\'" +
+                " start_app");
+        Host.tryConnectFor(10_000, Host.node_portB() == null ? 5673 : Integer.valueOf(Host.node_portB()));
     }
 }

src/test/java/com/rabbitmq/client/test/server/DurableBindingLifecycle.java

@@ -26,7 +26,6 @@
 
 import com.rabbitmq.client.GetResponse;
 import com.rabbitmq.client.test.functional.BindingLifecycleBase;
-import com.rabbitmq.tools.Host;
 
 /**
  * This tests whether bindings are created and nuked properly.
@@ -47,13 +46,8 @@ protected void restart() throws IOException, TimeoutException {
             alternateConnection = null;
             alternateChannel = null;
 
-            Host.invokeMakeTarget(
-              "stop-node" +
-              " start-background-broker" +
-              " RABBITMQ_NODENAME=\'" + Host.nodenameB() + "\'" +
-              " RABBITMQ_NODE_PORT=" + Host.node_portB() +
-              " RABBITMQ_CONFIG_FILE=\'" + Host.config_fileB() + "\'"
-            );
+            stopSecondary();
+            startSecondary();
         }
         restartPrimary();
     }

src/test/java/com/rabbitmq/tools/Host.java

@@ -17,12 +17,10 @@
 package com.rabbitmq.tools;
 
 import java.io.BufferedReader;
-import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 
 import com.rabbitmq.client.Connection;
@@ -121,17 +119,6 @@ public static void clearResourceAlarm(String source) throws IOException {
         rabbitmqctl("eval 'rabbit_alarm:clear_alarm({resource_limit, " + source + ", node()}).'");
     }
 
-    public static Process invokeMakeTarget(String command) throws IOException {
-        File rabbitmqctl = new File(rabbitmqctlCommand());
-        return executeCommand(makeCommand() +
-                              " -C \'" + rabbitmqDir() + "\'" +
-                              " RABBITMQCTL=\'" + rabbitmqctl.getAbsolutePath() + "\'" +
-                              " RABBITMQ_NODENAME=\'" + nodenameA() + "\'" +
-                              " RABBITMQ_NODE_PORT=" + node_portA() +
-                              " RABBITMQ_CONFIG_FILE=\'" + config_fileA() + "\'" +
-                              " " + command);
-    }
-
     public static void startRabbitOnNode() throws IOException {
         rabbitmqctl("start_app");
         tryConnectFor(10 * 1000);
@@ -142,6 +129,10 @@ public static void stopRabbitOnNode() throws IOException {
     }
 
     public static void tryConnectFor(int timeoutInMs) throws IOException {
+        tryConnectFor(timeoutInMs, node_portA() == null ? 5672 : Integer.valueOf(node_portA()));
+    }
+
+    public static void tryConnectFor(int timeoutInMs, int port) throws IOException {
         int waitTime = 100;
         int totalWaitTime = 0;
         while (totalWaitTime <= timeoutInMs) {
@@ -152,6 +143,7 @@ public static void tryConnectFor(int timeoutInMs) throws IOException {
             }
             totalWaitTime += waitTime;
             ConnectionFactory connectionFactory = TestUtils.connectionFactory();
+            connectionFactory.setPort(port);
             Connection c = null;
             try {
                 c = connectionFactory.newConnection();