Rip out ancient and erroneous calls to persister snapshot. Interestingly, the failing erl_call seemed to provide a sufficient delay to allow the restarting broker to come back up.

Author: Matthew Sackman

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

@@ -95,7 +95,6 @@ public void testRestart()
     {
         declareDurableQueue(Q);
         exercisePersister();
-        forceSnapshot();
         closeChannel();
         openChannel();
         exercisePersister();

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

@@ -53,7 +53,6 @@ public void testRestart()
         declareDurableQueue(Q2);
         exercisePersister(Q1);
         exercisePersister(Q2);
-        forceSnapshot();
         // Those will be in the incremental snapshot then
         exercisePersister(Q1);
         exercisePersister(Q2);

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

@@ -54,7 +54,6 @@ public void testRestart()
         channel.txSelect();
         exercisePersister(Q1);
         exercisePersister(Q2);
-        forceSnapshot();
         // removing messages which are in the snapshot
         channel.txRollback();
         // Those will be in the incremental snapshot then

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

@@ -58,7 +58,6 @@ public void testRestart()
         exercisePersister();
         channel.txCommit();
         exercisePersister();
-        forceSnapshot();
         // delivering messages which are in the snapshot
         channel.txCommit();
         // Those will be in the incremental snapshot then

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

@@ -58,7 +58,6 @@ public void testRestart()
         exercisePersister();
         channel.txCommit();
         exercisePersister();
-        forceSnapshot();
         // Delivering messages which are in the snapshot
         channel.txCommit();
         // Those will be in the incremental snapshot then

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

@@ -11,10 +11,8 @@ public void testRestart() throws IOException, InterruptedException {
         basicPublishPersistent("a".getBytes(), q);
         basicPublishPersistent("b".getBytes(), q);
         basicPublishPersistent("c".getBytes(), q);
-        forceSnapshot();
         restart();
         assertTrue(new String(basicGet(q).getBody()).equals("a"));
-        forceSnapshot();
         restart();
         restart();
         assertTrue(new String(basicGet(q).getBody()).equals("b"));

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

@@ -44,12 +44,11 @@ protected void restart()
     {
         tearDown();
         Host.executeCommand("cd ../rabbitmq-test; make restart-app");
+        try {
+            Thread.sleep(3000);
+        } catch (InterruptedException e) {
+        }
         setUp();
     }
 
-    protected void forceSnapshot()
-        throws IOException, InterruptedException
-    {
-        Host.executeCommand("cd ../rabbitmq-test; make force-snapshot");
-    }
 }