Merge pull request #28 from slaskawi/CLOUD-1509/Fix_false_sharing_between_tests

Cloud 1509/fix false sharing between tests

Author: rcernich

common/src/main/java/org/openshift/ping/common/server/AbstractServerFactory.java

@@ -19,7 +19,7 @@
 /**
  * @author <a href="mailto:[email protected]">Ales Justin</a>
  */
-public class JBossServerFactory extends AbstractServerFactory {
+public class JBossServerFactory implements ServerFactory {
 
     public boolean isAvailable() {
         try {
@@ -29,7 +29,8 @@ public boolean isAvailable() {
         }
     }
 
-    public Server createServer(int port) {
+    @Override
+    public Server getServer(int port) {
         return new JBossServer(port);
     }
 

common/src/main/java/org/openshift/ping/common/server/JBossServerFactory.java

@@ -19,7 +19,7 @@
 /**
  * @author <a href="mailto:[email protected]">Ales Justin</a>
  */
-public class JDKServerFactory extends AbstractServerFactory {
+public class JDKServerFactory implements ServerFactory {
 
     public boolean isAvailable() {
         try {
@@ -29,7 +29,8 @@ public boolean isAvailable() {
         }
     }
 
-    public Server createServer(int port) {
+    @Override
+    public Server getServer(int port) {
         return new JDKServer(port);
     }
 

common/src/main/java/org/openshift/ping/common/server/JDKServerFactory.java

@@ -19,7 +19,7 @@
 /**
  * @author <a href="mailto:[email protected]">Ales Justin</a>
  */
-public class UndertowServerFactory extends AbstractServerFactory {
+public class UndertowServerFactory implements ServerFactory {
 
     public boolean isAvailable() {
         try {
@@ -29,7 +29,8 @@ public boolean isAvailable() {
         }
     }
 
-    public Server createServer(int port) {
+    @Override
+    public Server getServer(int port) {
         return new UndertowServer(port);
     }
 

common/src/main/java/org/openshift/ping/common/server/UndertowServerFactory.java

@@ -41,7 +41,13 @@ public abstract class PingTestBase extends TestBase {
             if (CompatibilityUtils.isJGroups4()) {
                 waitForViewMethod = Util.class.getMethod("waitUntilAllChannelsHaveSameView", long.class, long.class, JChannel[].class);
             } else {
-                waitForViewMethod = Util.class.getMethod("waitUntilAllChannelsHaveSameSize", long.class, long.class, Channel[].class);
+                Method m;
+                try {
+                    m = Util.class.getMethod("waitUntilAllChannelsHaveSameSize", long.class, long.class, Channel[].class);
+                } catch (NoSuchMethodException e) {
+                    m = Util.class.getMethod("waitUntilAllChannelsHaveSameView", long.class, long.class, Channel[].class);
+                }
+                waitForViewMethod = m;
             }
         } catch (NoSuchMethodException e) {
             throw new CompatibilityException("Could not find proper 'waitUntilAllChannelsHaveSame*' method.", e);

kube/src/test/java/org/openshift/ping/kube/test/PingTestBase.java

@@ -19,6 +19,7 @@
 import java.io.ByteArrayOutputStream;
 import java.io.DataOutputStream;
 import java.lang.reflect.Constructor;
+import java.lang.reflect.Method;
 import java.net.HttpURLConnection;
 import java.net.URL;
 import java.util.Arrays;
@@ -75,11 +76,10 @@ public void testResponse() throws Exception {
         Address local_addr = pinger.getLocalAddress();
         PhysicalAddress physical_addr = (PhysicalAddress) pinger
                 .down(new Event(Event.GET_PHYSICAL_ADDRESS, local_addr));
-        PingHeader hdr = new TestPingHeader();
         PingData data = createPingData(local_addr, physical_addr);
+        final PingHeader hdr = getPingHeader(data);
         Message msg = new Message(null).setFlag(Message.Flag.DONT_BUNDLE)
                 .putHeader(pinger.getId(), hdr).setBuffer(streamableToBuffer(data));
-
         URL url = new URL("http://localhost:8888");
         HttpURLConnection conn = (HttpURLConnection) url.openConnection();
         conn.addRequestProperty(Server.CLUSTER_NAME, TestBase.CLUSTER_NAME);
@@ -93,6 +93,34 @@ public void testResponse() throws Exception {
         Assert.assertEquals(200, conn.getResponseCode());
     }
 
+    private static Buffer streamableToBuffer(Streamable obj) {
+        final ByteArrayOutputStream out_stream = new ByteArrayOutputStream(1024);
+        DataOutputStream out = new DataOutputStream(out_stream);
+        try {
+            Util.writeStreamable(obj, out);
+            return new Buffer(out_stream.toByteArray());
+        } catch (Exception ex) {
+            return null;
+        }
+    }
+
+    private PingHeader getPingHeader(PingData data) {
+        try {
+            if(CompatibilityUtils.isJGroups4()) {
+                Constructor<PingHeader> constructor = PingHeader.class.getConstructor(null);
+                PingHeader header = constructor.newInstance(null);
+                Method clusterName = header.getClass().getMethod("clusterName", String.class);
+                clusterName.invoke(header, TestBase.CLUSTER_NAME);
+                return header;
+            } else {
+                Constructor<PingHeader> constructor = PingHeader.class.getConstructor(byte.class, PingData.class, String.class);
+                return constructor.newInstance(PingHeader.GET_MBRS_RSP, data, TestBase.CLUSTER_NAME);
+            }
+        } catch (Exception e) {
+            throw new CompatibilityException("Could not find or invoke proper 'PingHeader' constructor");
+        }
+    }
+
     /*
      * Handled via reflection because of JGroups 3/4 incompatibility.
      */
@@ -112,17 +140,6 @@ private PingData createPingData(Address local_addr, PhysicalAddress physical_add
         }
     }
 
-    private static Buffer streamableToBuffer(Streamable obj) {
-        final ByteArrayOutputStream out_stream = new ByteArrayOutputStream(512);
-        DataOutputStream out = new DataOutputStream(out_stream);
-        try {
-            Util.writeStreamable(obj, out);
-            return new Buffer(out_stream.toByteArray());
-        } catch (Exception ex) {
-            return null;
-        }
-    }
-
     private static final class TestKubePing extends KubePing {
         static {
             ClassConfigurator.addProtocol(JGROUPS_KUBE_PING_ID, TestKubePing.class);
@@ -137,11 +154,4 @@ protected Client getClient() {
             return new TestClient();
         }
     }
-    
-    private static final class TestPingHeader extends PingHeader {
-        private TestPingHeader() {
-            cluster_name = TestBase.CLUSTER_NAME;
-            type = PingHeader.GET_MBRS_REQ;
-        }
-    }
 }

kube/src/test/java/org/openshift/ping/kube/test/ServerTestBase.java

@@ -18,15 +18,13 @@
 
 import org.jgroups.protocols.FILE_PING;
 import org.jgroups.stack.Protocol;
-import org.junit.Ignore;
 
 /**
  * A parallel test to ZK tests.
  * Just so we know tests are fine.
  *
  * @author <a href="mailto:[email protected]">Ales Justin</a>
  */
-@Ignore("To be clarified with Bela")
 public class SimplePingTest extends PingTestBase {
 
     protected Protocol createPing() {

kube/src/test/java/org/openshift/ping/kube/test/SimplePingTest.java

@@ -141,7 +141,7 @@
             </activation>
             <properties>
                 <!-- Impl -->
-                <version.jgroups>[3.2.6.Final,4.0.1.Final]</version.jgroups>
+                <version.jgroups>3.2.6.Final</version.jgroups>
                 <version.dmr>1.2.0.Final</version.dmr>
                 <!-- Build -->
                 <version.org.wildfly>8.2.1.Final</version.org.wildfly>