You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by km...@apache.org on 2016/12/23 21:10:18 UTC
[25/25] geode git commit: GEODE-2242: Invalid VersionTags are no
longer replicated across the WAN
GEODE-2242: Invalid VersionTags are no longer replicated across the WAN
Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/e8b03881
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/e8b03881
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/e8b03881
Branch: refs/heads/feature/GEODE-2231
Commit: e8b03881317aaa254af641ce1d4d554b239ab002
Parents: 32b8a00
Author: Barry Oglesby <bo...@pivotal.io>
Authored: Wed Dec 21 15:06:37 2016 -0800
Committer: Karen Miller <km...@pivotal.io>
Committed: Fri Dec 23 13:09:28 2016 -0800
----------------------------------------------------------------------
.../cache/wan/GatewaySenderEventImpl.java | 2 +-
.../internal/cache/UpdateVersionDUnitTest.java | 12 ++++---
.../geode/internal/cache/wan/WANTestBase.java | 5 +++
.../SerialGatewaySenderQueueDUnitTest.java | 7 +---
.../serial/SerialWANPropagationDUnitTest.java | 36 ++++++++++++++++++++
5 files changed, 51 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/geode/blob/e8b03881/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderEventImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderEventImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderEventImpl.java
index d4d21de..f8de085 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderEventImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderEventImpl.java
@@ -289,7 +289,7 @@ public class GatewaySenderEventImpl
// Initialize the creation timestamp
this.creationTime = System.currentTimeMillis();
- if (event.getVersionTag() != null) {
+ if (event.getVersionTag() != null && event.getVersionTag().hasValidVersion()) {
this.versionTimeStamp = event.getVersionTag().getVersionTimeStamp();
}
http://git-wip-us.apache.org/repos/asf/geode/blob/e8b03881/geode-wan/src/test/java/org/apache/geode/internal/cache/UpdateVersionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/UpdateVersionDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/UpdateVersionDUnitTest.java
index 78a759e..6481ad5 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/UpdateVersionDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/UpdateVersionDUnitTest.java
@@ -130,6 +130,7 @@ public class UpdateVersionDUnitTest extends JUnit4DistributedTestCase {
assertTrue(region instanceof PartitionedRegion);
region.put(key, "value-1");
+ region.put(key, "value-2");
Entry entry = region.getEntry(key);
assertTrue(entry instanceof EntrySnapshot);
RegionEntry regionEntry = ((EntrySnapshot) entry).getRegionEntry();
@@ -152,7 +153,7 @@ public class UpdateVersionDUnitTest extends JUnit4DistributedTestCase {
tag.setIsRemoteForTesting();
EntryEventImpl event =
- createNewEvent((PartitionedRegion) region, tag, entry.getKey(), "value-2");
+ createNewEvent((PartitionedRegion) region, tag, entry.getKey(), "value-3");
((LocalRegion) region).basicUpdate(event, false, true, 0L, false);
@@ -277,6 +278,7 @@ public class UpdateVersionDUnitTest extends JUnit4DistributedTestCase {
assertTrue(region instanceof DistributedRegion);
region.put(key, "value-1");
+ region.put(key, "value-2");
Entry entry = region.getEntry(key);
assertTrue(entry instanceof NonTXEntry);
RegionEntry regionEntry = ((NonTXEntry) entry).getRegionEntry();
@@ -299,7 +301,7 @@ public class UpdateVersionDUnitTest extends JUnit4DistributedTestCase {
tag.setIsRemoteForTesting();
EntryEventImpl event =
- createNewEvent((DistributedRegion) region, tag, entry.getKey(), "value-2");
+ createNewEvent((DistributedRegion) region, tag, entry.getKey(), "value-3");
((LocalRegion) region).basicUpdate(event, false, true, 0L, false);
@@ -412,6 +414,7 @@ public class UpdateVersionDUnitTest extends JUnit4DistributedTestCase {
assertTrue(region instanceof PartitionedRegion);
region.put(key, "value-1");
+ region.put(key, "value-2");
Entry entry = region.getEntry(key);
assertTrue(entry instanceof EntrySnapshot);
RegionEntry regionEntry = ((EntrySnapshot) entry).getRegionEntry();
@@ -434,7 +437,7 @@ public class UpdateVersionDUnitTest extends JUnit4DistributedTestCase {
tag.setIsRemoteForTesting();
EntryEventImpl event =
- createNewEvent((PartitionedRegion) region, tag, entry.getKey(), "value-2");
+ createNewEvent((PartitionedRegion) region, tag, entry.getKey(), "value-3");
((LocalRegion) region).basicUpdate(event, false, true, 0L, false);
@@ -560,6 +563,7 @@ public class UpdateVersionDUnitTest extends JUnit4DistributedTestCase {
assertTrue(region instanceof PartitionedRegion);
region.put(key, "value-1");
+ region.put(key, "value-2");
Entry entry = region.getEntry(key);
assertTrue(entry instanceof EntrySnapshot);
RegionEntry regionEntry = ((EntrySnapshot) entry).getRegionEntry();
@@ -582,7 +586,7 @@ public class UpdateVersionDUnitTest extends JUnit4DistributedTestCase {
tag.setIsRemoteForTesting();
EntryEventImpl event =
- createNewEvent((PartitionedRegion) region, tag, entry.getKey(), "value-2");
+ createNewEvent((PartitionedRegion) region, tag, entry.getKey(), "value-3");
((LocalRegion) region).basicUpdate(event, false, true, 0L, false);
http://git-wip-us.apache.org/repos/asf/geode/blob/e8b03881/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/WANTestBase.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/WANTestBase.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/WANTestBase.java
index b0cece0..3f7f4c2 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/WANTestBase.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/WANTestBase.java
@@ -3447,6 +3447,11 @@ public class WANTestBase extends JUnit4DistributedTestCase {
}
}
+ protected static void verifyListenerEvents(final long expectedNumEvents) {
+ Awaitility.await().atMost(60, TimeUnit.SECONDS)
+ .until(() -> listener1.getNumEvents() == expectedNumEvents);
+ }
+
protected Integer[] createLNAndNYLocators() {
Integer lnPort = vm0.invoke(() -> createFirstLocatorWithDSId(1));
Integer nyPort = vm1.invoke(() -> createFirstRemoteLocator(2, lnPort));
http://git-wip-us.apache.org/repos/asf/geode/blob/e8b03881/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderQueueDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderQueueDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderQueueDUnitTest.java
index 7417c80..64f94dd 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderQueueDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderQueueDUnitTest.java
@@ -357,12 +357,7 @@ public class SerialGatewaySenderQueueDUnitTest extends WANTestBase {
vm4.invoke(() -> WANTestBase.doPuts(getTestMethodName() + "_RR", numPuts));
// Verify receiver listener events
- vm2.invoke(() -> SerialGatewaySenderQueueDUnitTest.verifyListenerEvents(maxSenders * numPuts));
- }
-
- private static void verifyListenerEvents(final long expectedNumEvents) {
- Awaitility.await().atMost(60, TimeUnit.SECONDS)
- .until(() -> listener1.getNumEvents() == expectedNumEvents);
+ vm2.invoke(() -> WANTestBase.verifyListenerEvents(maxSenders * numPuts));
}
/**
http://git-wip-us.apache.org/repos/asf/geode/blob/e8b03881/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialWANPropagationDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialWANPropagationDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialWANPropagationDUnitTest.java
index 28f8f0c..a60614c 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialWANPropagationDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialWANPropagationDUnitTest.java
@@ -19,6 +19,8 @@ import static org.junit.Assert.*;
import java.io.IOException;
import java.util.Map;
+import org.apache.geode.cache.DataPolicy;
+import org.apache.geode.cache.Scope;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -1262,4 +1264,38 @@ public class SerialWANPropagationDUnitTest extends WANTestBase {
vm2.invoke(() -> WANTestBase.validateRegionSize(getTestMethodName() + "_RR", 1000));
vm3.invoke(() -> WANTestBase.validateRegionSize(getTestMethodName() + "_RR", 1000));
}
+
+ @Test
+ public void testPreloadedSerialPropagation() throws Exception {
+ // Start locators
+ Integer lnPort = vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId(1));
+ Integer nyPort = vm1.invoke(() -> WANTestBase.createFirstRemoteLocator(2, lnPort));
+
+ // Create receiver and preloaded region
+ String regionName = getTestMethodName() + "_preloaded";
+ vm2.invoke(() -> WANTestBase.createCache(nyPort));
+ vm2.invoke(() -> WANTestBase.createReplicatedRegion(regionName, null, Scope.DISTRIBUTED_ACK,
+ DataPolicy.PRELOADED, isOffHeap()));
+ vm2.invoke(() -> WANTestBase.createReceiver());
+ vm2.invoke(() -> WANTestBase.addListenerOnRegion(regionName));
+
+ // Create sender and preloaded region
+ vm4.invoke(() -> WANTestBase.createCache(lnPort));
+ vm4.invoke(() -> WANTestBase.createSender("ln", 2, false, 100, 10, false, false, null, false));
+ vm4.invoke(() -> WANTestBase.createReplicatedRegion(regionName, "ln", Scope.DISTRIBUTED_ACK,
+ DataPolicy.PRELOADED, isOffHeap()));
+
+ // Do puts
+ int numEvents = 10;
+ vm4.invoke(() -> WANTestBase.doPuts(regionName, numEvents));
+
+ // Verify receiver listener events
+ vm2.invoke(() -> WANTestBase.verifyListenerEvents(numEvents));
+
+ // Do destroys
+ vm4.invoke(() -> WANTestBase.doDestroys(regionName, numEvents));
+
+ // Verify receiver listener events
+ vm2.invoke(() -> WANTestBase.verifyListenerEvents(numEvents * 2));
+ }
}