Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

GEODE-7230: Avoid verification occurred before commit is finished. #4082

Merged
merged 1 commit into from
Oct 3, 2019
Merged

GEODE-7230: Avoid verification occurred before commit is finished. #4082

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
31 changes: 24 additions & 7 deletions .../java/org/apache/geode/internal/cache/ClientServerTransactionFailoverDistributedTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@
import org.apache.geode.internal.cache.tier.sockets.ClientHealthMonitor;
import org.apache.geode.internal.cache.tier.sockets.ClientProxyMembershipID;
import org.apache.geode.internal.logging.LogService;
import org.apache.geode.test.awaitility.GeodeAwaitility;
import org.apache.geode.test.dunit.AsyncInvocation;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.rules.CacheRule;
Expand Down Expand Up @@ -127,6 +128,12 @@ private int createServerRegion(int totalNumBuckets, boolean isAccessor) throws E

private int createServerRegion(int totalNumBuckets, boolean isAccessor, int redundancy)
throws Exception {
return createServerRegion(totalNumBuckets, isAccessor, redundancy, false);
}

private int createServerRegion(int totalNumBuckets, boolean isAccessor, int redundancy,
boolean setMaximumTimeBetweenPingsLargerThanDefaultTimeout)
throws Exception {
PartitionAttributesFactory factory = new PartitionAttributesFactory();
factory.setTotalNumBuckets(totalNumBuckets).setRedundantCopies(redundancy);
if (isAccessor) {
Expand All @@ -138,6 +145,12 @@ private int createServerRegion(int totalNumBuckets, boolean isAccessor, int redu

CacheServer server = cacheRule.getCache().addCacheServer();
server.setPort(0);
if (setMaximumTimeBetweenPingsLargerThanDefaultTimeout) {
// set longer than GeodeAwaitility.DEFAULT_TIMEOUT to avoid GII triggered by
// region synchronize with.
// This ensures the commit is brought into replicas by the CommitProcessQueryMessage.
server.setMaximumTimeBetweenPings((int) GeodeAwaitility.getTimeout().getValueInMS() + 60000);
}
server.start();
return server.getPort();
}
Expand Down Expand Up @@ -356,17 +369,17 @@ public void txCommitGetsAppliedOnAllTheReplicasAfterHostIsShutDownAndIfOneOfTheN
getBlackboard().initBlackboard();
VM client = server4;

port1 = server1.invoke(() -> createServerRegion(1, false, 2));
port1 = server1.invoke(() -> createServerRegion(1, false, 2, true));

server1.invoke(() -> {
Region region = cacheRule.getCache().getRegion(regionName);
region.put("Key-1", "Value-1");
region.put("Key-2", "Value-2");
});

port2 = server2.invoke(() -> createServerRegion(1, false, 2));
port2 = server2.invoke(() -> createServerRegion(1, false, 2, true));

server3.invoke(() -> createServerRegion(1, false, 2));
server3.invoke(() -> createServerRegion(1, false, 2, true));

client.invoke(() -> createClientRegion(true, port1, port2));

Expand Down Expand Up @@ -433,14 +446,18 @@ public void beforeProcessMessage(ClusterDistributionManager dm,

server2.invoke(() -> {
Region region = cacheRule.getCache().getRegion(regionName);
assertThat(region.get("TxKey-1")).isEqualTo("TxValue-1");
assertThat(region.get("TxKey-2")).isEqualTo("TxValue-2");
await().untilAsserted(() -> {
assertThat(region.get("TxKey-1")).isEqualTo("TxValue-1");
assertThat(region.get("TxKey-2")).isEqualTo("TxValue-2");
});
});

server3.invoke(() -> {
Region region = cacheRule.getCache().getRegion(regionName);
assertThat(region.get("TxKey-1")).isEqualTo("TxValue-1");
assertThat(region.get("TxKey-2")).isEqualTo("TxValue-2");
await().untilAsserted(() -> {
assertThat(region.get("TxKey-1")).isEqualTo("TxValue-1");
assertThat(region.get("TxKey-2")).isEqualTo("TxValue-2");
});
});

client.invoke(() -> {
Expand Down