You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by es...@apache.org on 2019/08/28 19:36:42 UTC
[geode] branch feature/GEODE-7138 updated: GEODE-7138: fixing a
flaky test by setting timeout accordingly.
This is an automated email from the ASF dual-hosted git repository.
eshu11 pushed a commit to branch feature/GEODE-7138
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/feature/GEODE-7138 by this push:
new 9d57154 GEODE-7138: fixing a flaky test by setting timeout accordingly.
9d57154 is described below
commit 9d5715489a349f57237b2e592fd3feb48814ca82
Author: eshu <es...@pivotal.io>
AuthorDate: Wed Aug 28 12:35:33 2019 -0700
GEODE-7138: fixing a flaky test by setting timeout accordingly.
---
...overWithMixedVersionServersDistributedTest.java | 24 +++++++++++-----------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ClientServerTransactionFailoverWithMixedVersionServersDistributedTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ClientServerTransactionFailoverWithMixedVersionServersDistributedTest.java
index 92b6a3a..1be3fe4 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ClientServerTransactionFailoverWithMixedVersionServersDistributedTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ClientServerTransactionFailoverWithMixedVersionServersDistributedTest.java
@@ -63,8 +63,6 @@ import org.apache.geode.test.version.VersionManager;
@SuppressWarnings("serial")
public class ClientServerTransactionFailoverWithMixedVersionServersDistributedTest
implements Serializable {
-
- private static final int TRANSACTION_TIMEOUT_SECOND = 2;
private static final int VM_COUNT = 6;
private String hostName;
@@ -116,12 +114,13 @@ public class ClientServerTransactionFailoverWithMixedVersionServersDistributedTe
public void clientTransactionOperationsAreNotLostIfTransactionIsOnRolledServer()
throws Exception {
setupPartiallyRolledVersion();
+ int timeoutSeconds = 30;
- server1.invoke(() -> createServerRegion(1, false));
+ server1.invoke(() -> createServerRegion(1, false, timeoutSeconds));
server1.invoke(() -> cacheRule.getCache().getRegion(regionName).put(1, "originalValue"));
- server2.invoke(() -> createServerRegion(1, true));
- server3.invoke(() -> createServerRegion(1, true));
- server4.invoke(() -> createServerRegion(1, true));
+ server2.invoke(() -> createServerRegion(1, true, timeoutSeconds));
+ server3.invoke(() -> createServerRegion(1, true, timeoutSeconds));
+ server4.invoke(() -> createServerRegion(1, true, timeoutSeconds));
client.invoke(() -> createClientRegion());
ClientProxyMembershipID clientProxyMembershipID = client.invoke(() -> getClientId());
@@ -218,7 +217,7 @@ public class ClientServerTransactionFailoverWithMixedVersionServersDistributedTe
return rollServer;
}
- private void createServerRegion(int totalNumBuckets, boolean isAccessor) {
+ private void createServerRegion(int totalNumBuckets, boolean isAccessor, int timeoutSeconds) {
PartitionAttributesFactory factory = new PartitionAttributesFactory();
factory.setTotalNumBuckets(totalNumBuckets);
if (isAccessor) {
@@ -229,7 +228,7 @@ public class ClientServerTransactionFailoverWithMixedVersionServersDistributedTe
.setPartitionAttributes(partitionAttributes).create(regionName);
TXManagerImpl txManager = cacheRule.getCache().getTxManager();
- txManager.setTransactionTimeToLiveForTest(TRANSACTION_TIMEOUT_SECOND);
+ txManager.setTransactionTimeToLiveForTest(timeoutSeconds);
}
private void createClientRegion() {
@@ -370,11 +369,12 @@ public class ClientServerTransactionFailoverWithMixedVersionServersDistributedTe
@Test
public void clientTransactionExpiredAreRemovedOnRolledServer() throws Exception {
setupPartiallyRolledVersion();
+ int timeoutSeconds = 2;
- server1.invoke(() -> createServerRegion(1, false));
- server2.invoke(() -> createServerRegion(1, true));
- server3.invoke(() -> createServerRegion(1, true));
- server4.invoke(() -> createServerRegion(1, true));
+ server1.invoke(() -> createServerRegion(1, false, timeoutSeconds));
+ server2.invoke(() -> createServerRegion(1, true, timeoutSeconds));
+ server3.invoke(() -> createServerRegion(1, true, timeoutSeconds));
+ server4.invoke(() -> createServerRegion(1, true, timeoutSeconds));
client.invoke(() -> createClientRegion());
ClientProxyMembershipID clientProxyMembershipID = client.invoke(() -> getClientId());