You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by bs...@apache.org on 2019/11/05 19:05:51 UTC

[geode] branch feature/GEODE-6661 updated: reverting investigative changes to test

This is an automated email from the ASF dual-hosted git repository.

bschuchardt pushed a commit to branch feature/GEODE-6661
in repository https://gitbox.apache.org/repos/asf/geode.git


The following commit(s) were added to refs/heads/feature/GEODE-6661 by this push:
     new b7938bc  reverting investigative changes to test
b7938bc is described below

commit b7938bc8eba39c73795e3fec69c8e6280bdbd061
Author: Bruce Schuchardt <bs...@pivotal.io>
AuthorDate: Tue Nov 5 11:01:49 2019 -0800

    reverting investigative changes to test
---
 .../geode/ClusterCommunicationsDUnitTest.java      | 53 ++++------------------
 1 file changed, 9 insertions(+), 44 deletions(-)

diff --git a/geode-core/src/distributedTest/java/org/apache/geode/ClusterCommunicationsDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/ClusterCommunicationsDUnitTest.java
index 8d313a1..492ec3a 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/ClusterCommunicationsDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/ClusterCommunicationsDUnitTest.java
@@ -167,17 +167,10 @@ public class ClusterCommunicationsDUnitTest implements Serializable {
       createCacheAndRegion(getVM(i), locatorPort);
     }
     performCreateWithLargeValue(getVM(1));
-    performUpdateWithLargeValue(getVM(1));
-  }
-
-  @Test
-  public void createEntryWithSmallMessage() {
-    int locatorPort = createLocator(getVM(0));
-    for (int i = 1; i <= NUM_SERVERS; i++) {
-      createCacheAndRegion(getVM(i), locatorPort);
+    // fault the value into an empty cache - forces use of message chunking
+    for (int i = 1; i <= NUM_SERVERS - 1; i++) {
+      verifyCreatedEntry(getVM(i));
     }
-    performCreateWithSmallValue(getVM(1));
-    performUpdateWithSmallValue(getVM(1));
   }
 
   @Test
@@ -269,40 +262,12 @@ public class ClusterCommunicationsDUnitTest implements Serializable {
 
   private void performCreateWithLargeValue(VM memberVM) {
     memberVM.invoke("perform create", () -> {
-      byte[] value = new byte[1024];
+      byte[] value = new byte[SMALL_BUFFER_SIZE * 20];
       Arrays.fill(value, (byte) 1);
       cache.getRegion(regionName).put("testKey", value);
     });
   }
 
-  private void performUpdateWithLargeValue(VM memberVM) {
-    memberVM.invoke("perform update", () -> {
-      byte[] value = new byte[1024];
-      Arrays.fill(value, (byte) 1);
-      for (int i = 0; i < 1000; i++) {
-        cache.getRegion(regionName).put("testKey", value);
-      }
-    });
-  }
-
-  private void performCreateWithSmallValue(VM memberVM) {
-    memberVM.invoke("perform create", () -> {
-      byte[] value = new byte[512];
-      Arrays.fill(value, (byte) 1);
-      cache.getRegion(regionName).put("testKey", value);
-    });
-  }
-
-  private void performUpdateWithSmallValue(VM memberVM) {
-    memberVM.invoke("perform update", () -> {
-      byte[] value = new byte[512];
-      Arrays.fill(value, (byte) 1);
-      for (int i = 0; i < 1000; i++) {
-        cache.getRegion(regionName).put("testKey", value);
-      }
-    });
-  }
-
   private void verifyCreatedEntry(VM memberVM) {
     memberVM.invoke("verify entry created", () -> Assert.assertTrue(cache
         .getRegion(regionName).containsKey("testKey")));
@@ -374,11 +339,11 @@ public class ClusterCommunicationsDUnitTest implements Serializable {
   }
 
   enum RunConfiguration {
-    // SHARED_CONNECTIONS(true, false, false),
-    // SHARED_CONNECTIONS_WITH_SSL(true, true, false),
-    // UNSHARED_CONNECTIONS(false, false, false),
-    UNSHARED_CONNECTIONS_WITH_SSL(false, true, false);
-    // UDP_CONNECTIONS(true, false, true);
+    SHARED_CONNECTIONS(true, false, false),
+    SHARED_CONNECTIONS_WITH_SSL(true, true, false),
+    UNSHARED_CONNECTIONS(false, false, false),
+    UNSHARED_CONNECTIONS_WITH_SSL(false, true, false),
+    UDP_CONNECTIONS(true, false, true);
 
     boolean useSSL;
     boolean conserveSockets;