You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by sa...@apache.org on 2021/04/13 14:28:20 UTC
[geode] 10/11: GEODE-8684: Setting a session's maxInactiveInterval
does not work when the commit valve is disabled (#5724)
This is an automated email from the ASF dual-hosted git repository.
sabbey37 pushed a commit to branch support/1.13
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 814482d186f094b388076194b1e1f1189f4dc9b4
Author: Jens Deppe <jd...@pivotal.io>
AuthorDate: Wed Nov 11 08:40:48 2020 -0800
GEODE-8684: Setting a session's maxInactiveInterval does not work when the commit valve is disabled (#5724)
Co-Authored-by: Jens Deppe <jd...@vmware.com>
Co-Authored-by: Sarah Abbey <sa...@vmware.com>
(cherry picked from commit ba8f9015530af10c3e9d1df1e73524bdc6c8a3cc)
---
.../modules/session/catalina/DeltaSession.java | 4 +++
.../geode/session/tests/TomcatContainer.java | 15 +++++----
.../apache/geode/session/tests/TomcatInstall.java | 36 ++++++++++++++++++++--
.../apache/geode/session/tests/CargoTestBase.java | 9 +++---
.../tests/Tomcat6CachingClientServerTest.java | 2 +-
.../session/tests/Tomcat6ClientServerTest.java | 3 +-
.../apache/geode/session/tests/Tomcat6Test.java | 3 +-
.../tests/Tomcat7CachingClientServerTest.java | 2 +-
.../session/tests/Tomcat7ClientServerTest.java | 3 +-
.../apache/geode/session/tests/Tomcat7Test.java | 3 +-
.../tests/Tomcat8CachingClientServerTest.java | 2 +-
.../session/tests/Tomcat8ClientServerTest.java | 3 +-
.../apache/geode/session/tests/Tomcat8Test.java | 3 +-
.../tests/Tomcat9CachingClientServerTest.java | 2 +-
...mcat9CachingClientServerValveDisabledTest.java} | 4 +--
.../session/tests/Tomcat9ClientServerTest.java | 3 +-
.../apache/geode/session/tests/Tomcat9Test.java | 3 +-
.../Tomcat8ClientServerRollingUpgradeTest.java | 4 +--
...omcatSessionBackwardsCompatibilityTestBase.java | 8 ++---
19 files changed, 76 insertions(+), 36 deletions(-)
diff --git a/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/DeltaSession.java b/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/DeltaSession.java
index 1968550..e745ffe 100644
--- a/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/DeltaSession.java
+++ b/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/DeltaSession.java
@@ -413,6 +413,10 @@ public class DeltaSession extends StandardSession
@Override
public void setMaxInactiveInterval(int interval) {
super.setMaxInactiveInterval(interval);
+
+ if (!isCommitEnabled() && id != null) {
+ putInRegion(getOperatingRegion(), true, null);
+ }
}
@Override
diff --git a/geode-assembly/geode-assembly-test/src/main/java/org/apache/geode/session/tests/TomcatContainer.java b/geode-assembly/geode-assembly-test/src/main/java/org/apache/geode/session/tests/TomcatContainer.java
index 38d262d..b0d4168 100644
--- a/geode-assembly/geode-assembly-test/src/main/java/org/apache/geode/session/tests/TomcatContainer.java
+++ b/geode-assembly/geode-assembly-test/src/main/java/org/apache/geode/session/tests/TomcatContainer.java
@@ -65,17 +65,16 @@ public class TomcatContainer extends ServerContainer {
setConfigFile(contextXMLFile.getAbsolutePath(), DEFAULT_TOMCAT_XML_REPLACEMENT_DIR,
DEFAULT_TOMCAT_CONTEXT_XML_REPLACEMENT_NAME);
- if (install.getConnectionType() == ContainerInstall.ConnectionType.CLIENT_SERVER) {
- // using proxy region, override the default client/server setting to set to false
+ if (install.getConnectionType() == ContainerInstall.ConnectionType.CLIENT_SERVER ||
+ install.getConnectionType() == ContainerInstall.ConnectionType.CACHING_CLIENT_SERVER) {
setCacheProperty("enableLocalCache",
String.valueOf(install.getConnectionType().enableLocalCache()));
- } else {
- // using default, either setting it explicitly or leave it off should have the same effect
- if (System.currentTimeMillis() % 2 == 0) {
- setCacheProperty("enableLocalCache",
- String.valueOf(install.getConnectionType().enableLocalCache()));
- }
}
+
+ if (install.getCommitValve() != TomcatInstall.CommitValve.DEFAULT) {
+ setCacheProperty("enableCommitValve", install.getCommitValve().getValue());
+ }
+
setCacheProperty("className", install.getContextSessionManagerClass());
// Deploy war file to container configuration
diff --git a/geode-assembly/geode-assembly-test/src/main/java/org/apache/geode/session/tests/TomcatInstall.java b/geode-assembly/geode-assembly-test/src/main/java/org/apache/geode/session/tests/TomcatInstall.java
index 322558e..af7d955 100644
--- a/geode-assembly/geode-assembly-test/src/main/java/org/apache/geode/session/tests/TomcatInstall.java
+++ b/geode-assembly/geode-assembly-test/src/main/java/org/apache/geode/session/tests/TomcatInstall.java
@@ -89,6 +89,26 @@ public class TomcatInstall extends ContainerInstall {
}
/**
+ * This determines the setting for 'enableCommitValve' in Tomcat's context.xml when configuring
+ * the DeltaSessionManager.
+ */
+ public enum CommitValve {
+ ENABLED("true"),
+ DISABLED("false"),
+ DEFAULT(null);
+
+ private final String value;
+
+ CommitValve(String value) {
+ this.value = value;
+ }
+
+ public String getValue() {
+ return value;
+ }
+ }
+
+ /**
* If you update this list method to return different dependencies, please also update the Tomcat
* module documentation! The documentation can be found here:
* geode-docs/tools_modules/http_session_mgmt/tomcat_installing_the_module.html.md.erb
@@ -103,11 +123,14 @@ public class TomcatInstall extends ContainerInstall {
private final TomcatVersion version;
+ private final CommitValve commitValve;
+
public TomcatInstall(String name, TomcatVersion version, ConnectionType connectionType,
- IntSupplier portSupplier)
+ IntSupplier portSupplier,
+ CommitValve commitValve)
throws Exception {
this(name, version, connectionType, DEFAULT_MODULE_LOCATION, GEODE_BUILD_HOME_LIB,
- portSupplier);
+ portSupplier, commitValve);
}
/**
@@ -120,12 +143,14 @@ public class TomcatInstall extends ContainerInstall {
* skipping properties needed to speedup container startup.
*/
public TomcatInstall(String name, TomcatVersion version, ConnectionType connType,
- String modulesJarLocation, String extraJarsPath, IntSupplier portSupplier)
+ String modulesJarLocation, String extraJarsPath, IntSupplier portSupplier,
+ CommitValve commitValve)
throws Exception {
// Does download and install from URL
super(name, version.getDownloadURL(), connType, "tomcat", modulesJarLocation, portSupplier);
this.version = version;
+ this.commitValve = commitValve;
modulesJarLocation = getModulePath() + "/lib/";
// Install geode sessions into tomcat install
@@ -241,6 +266,10 @@ public class TomcatInstall extends ContainerInstall {
return version.name() + "_" + getConnectionType().getName();
}
+ public CommitValve getCommitValve() {
+ return commitValve;
+ }
+
/**
* Copies jars specified by {@link #tomcatRequiredJars} from the {@link #getModulePath()} and the
* specified other directory passed to the function
@@ -315,4 +344,5 @@ public class TomcatInstall extends ContainerInstall {
editPropertyFile(getHome() + "/conf/catalina.properties", version.jarSkipPropertyName(),
jarsToSkip, true);
}
+
}
diff --git a/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/CargoTestBase.java b/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/CargoTestBase.java
index 8f487de..9d57f22 100644
--- a/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/CargoTestBase.java
+++ b/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/CargoTestBase.java
@@ -24,6 +24,7 @@ import java.net.URISyntaxException;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
+import java.util.concurrent.TimeUnit;
import java.util.function.IntSupplier;
import org.apache.logging.log4j.Logger;
@@ -34,7 +35,6 @@ import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.junit.rules.TestName;
-import org.apache.geode.internal.AvailablePortHelper;
import org.apache.geode.internal.UniquePortSupplier;
import org.apache.geode.logging.internal.log4j.api.LogService;
import org.apache.geode.modules.session.functions.GetMaxInactiveInterval;
@@ -82,8 +82,7 @@ public abstract class CargoTestBase {
public void setup() throws Exception {
dumpDockerInfo();
announceTest("START");
- int locatorPortSuggestion = AvailablePortHelper.getRandomAvailableTCPPort();
- locatorVM = clusterStartupRule.startLocatorVM(0, locatorPortSuggestion);
+ locatorVM = clusterStartupRule.startLocatorVM(0);
client = new Client();
manager = new ContainerManager();
@@ -257,7 +256,7 @@ public abstract class CargoTestBase {
client.setMaxInactive(1); // max inactive time is 1 second. Lets wait a second.
Thread.sleep(2000);
- await().untilAsserted(() -> {
+ await().atMost(10, TimeUnit.SECONDS).untilAsserted(() -> {
verifySessionIsRemoved(key);
Thread.sleep(1000);
});
@@ -293,7 +292,7 @@ public abstract class CargoTestBase {
for (int i = 0; i < manager.numContainers(); i++) {
client.setPort(Integer.parseInt(manager.getContainerPort(i)));
if (install.getConnectionType() == ContainerInstall.ConnectionType.CACHING_CLIENT_SERVER) {
- await().until(() -> Integer.toString(expected)
+ await().atMost(30, TimeUnit.SECONDS).until(() -> Integer.toString(expected)
.equals(client.executionFunction(GetMaxInactiveInterval.class).getResponse()));
} else {
assertEquals(Integer.toString(expected),
diff --git a/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/Tomcat6CachingClientServerTest.java b/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/Tomcat6CachingClientServerTest.java
index 3bd14ee..1c6f9d0 100644
--- a/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/Tomcat6CachingClientServerTest.java
+++ b/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/Tomcat6CachingClientServerTest.java
@@ -23,6 +23,6 @@ public class Tomcat6CachingClientServerTest extends TomcatClientServerTest {
@Override
public ContainerInstall getInstall(IntSupplier portSupplier) throws Exception {
return new TomcatInstall(getClass().getSimpleName(), TOMCAT6, CACHING_CLIENT_SERVER,
- portSupplier);
+ portSupplier, TomcatInstall.CommitValve.DEFAULT);
}
}
diff --git a/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/Tomcat6ClientServerTest.java b/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/Tomcat6ClientServerTest.java
index 1924034..75d853d 100644
--- a/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/Tomcat6ClientServerTest.java
+++ b/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/Tomcat6ClientServerTest.java
@@ -22,6 +22,7 @@ import java.util.function.IntSupplier;
public class Tomcat6ClientServerTest extends TomcatClientServerTest {
@Override
public ContainerInstall getInstall(IntSupplier portSupplier) throws Exception {
- return new TomcatInstall(getClass().getSimpleName(), TOMCAT6, CLIENT_SERVER, portSupplier);
+ return new TomcatInstall(getClass().getSimpleName(), TOMCAT6, CLIENT_SERVER, portSupplier,
+ TomcatInstall.CommitValve.DEFAULT);
}
}
diff --git a/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/Tomcat6Test.java b/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/Tomcat6Test.java
index 60dface..50487d0 100644
--- a/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/Tomcat6Test.java
+++ b/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/Tomcat6Test.java
@@ -22,6 +22,7 @@ import java.util.function.IntSupplier;
public class Tomcat6Test extends CargoTestBase {
@Override
public ContainerInstall getInstall(IntSupplier portSupplier) throws Exception {
- return new TomcatInstall(getClass().getSimpleName(), TOMCAT6, PEER_TO_PEER, portSupplier);
+ return new TomcatInstall(getClass().getSimpleName(), TOMCAT6, PEER_TO_PEER, portSupplier,
+ TomcatInstall.CommitValve.DEFAULT);
}
}
diff --git a/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/Tomcat7CachingClientServerTest.java b/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/Tomcat7CachingClientServerTest.java
index c2db978..4401bfe 100644
--- a/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/Tomcat7CachingClientServerTest.java
+++ b/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/Tomcat7CachingClientServerTest.java
@@ -23,6 +23,6 @@ public class Tomcat7CachingClientServerTest extends TomcatClientServerTest {
@Override
public ContainerInstall getInstall(IntSupplier portSupplier) throws Exception {
return new TomcatInstall(getClass().getSimpleName(), TOMCAT7, CACHING_CLIENT_SERVER,
- portSupplier);
+ portSupplier, TomcatInstall.CommitValve.DEFAULT);
}
}
diff --git a/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/Tomcat7ClientServerTest.java b/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/Tomcat7ClientServerTest.java
index 5c39fd2..f2cacf5 100644
--- a/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/Tomcat7ClientServerTest.java
+++ b/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/Tomcat7ClientServerTest.java
@@ -23,6 +23,7 @@ import java.util.function.IntSupplier;
public class Tomcat7ClientServerTest extends TomcatClientServerTest {
@Override
public ContainerInstall getInstall(IntSupplier portSupplier) throws Exception {
- return new TomcatInstall(getClass().getSimpleName(), TOMCAT7, CLIENT_SERVER, portSupplier);
+ return new TomcatInstall(getClass().getSimpleName(), TOMCAT7, CLIENT_SERVER, portSupplier,
+ TomcatInstall.CommitValve.DEFAULT);
}
}
diff --git a/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/Tomcat7Test.java b/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/Tomcat7Test.java
index 1922fdb..5e93e1f 100644
--- a/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/Tomcat7Test.java
+++ b/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/Tomcat7Test.java
@@ -22,6 +22,7 @@ import java.util.function.IntSupplier;
public class Tomcat7Test extends CargoTestBase {
@Override
public ContainerInstall getInstall(IntSupplier portSupplier) throws Exception {
- return new TomcatInstall(getClass().getSimpleName(), TOMCAT7, PEER_TO_PEER, portSupplier);
+ return new TomcatInstall(getClass().getSimpleName(), TOMCAT7, PEER_TO_PEER, portSupplier,
+ TomcatInstall.CommitValve.DEFAULT);
}
}
diff --git a/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/Tomcat8CachingClientServerTest.java b/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/Tomcat8CachingClientServerTest.java
index 03b65df..ca3e921 100644
--- a/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/Tomcat8CachingClientServerTest.java
+++ b/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/Tomcat8CachingClientServerTest.java
@@ -23,6 +23,6 @@ public class Tomcat8CachingClientServerTest extends TomcatClientServerTest {
@Override
public ContainerInstall getInstall(IntSupplier portSupplier) throws Exception {
return new TomcatInstall(getClass().getSimpleName(), TOMCAT8, CACHING_CLIENT_SERVER,
- portSupplier);
+ portSupplier, TomcatInstall.CommitValve.DEFAULT);
}
}
diff --git a/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/Tomcat8ClientServerTest.java b/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/Tomcat8ClientServerTest.java
index a4e960d..f52eacc 100644
--- a/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/Tomcat8ClientServerTest.java
+++ b/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/Tomcat8ClientServerTest.java
@@ -22,6 +22,7 @@ import java.util.function.IntSupplier;
public class Tomcat8ClientServerTest extends TomcatClientServerTest {
@Override
public ContainerInstall getInstall(IntSupplier portSupplier) throws Exception {
- return new TomcatInstall(getClass().getSimpleName(), TOMCAT8, CLIENT_SERVER, portSupplier);
+ return new TomcatInstall(getClass().getSimpleName(), TOMCAT8, CLIENT_SERVER, portSupplier,
+ TomcatInstall.CommitValve.DEFAULT);
}
}
diff --git a/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/Tomcat8Test.java b/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/Tomcat8Test.java
index 93a7441..dba0402 100644
--- a/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/Tomcat8Test.java
+++ b/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/Tomcat8Test.java
@@ -22,6 +22,7 @@ import java.util.function.IntSupplier;
public class Tomcat8Test extends CargoTestBase {
@Override
public ContainerInstall getInstall(IntSupplier portSupplier) throws Exception {
- return new TomcatInstall(getClass().getSimpleName(), TOMCAT8, PEER_TO_PEER, portSupplier);
+ return new TomcatInstall(getClass().getSimpleName(), TOMCAT8, PEER_TO_PEER, portSupplier,
+ TomcatInstall.CommitValve.DEFAULT);
}
}
diff --git a/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/Tomcat9CachingClientServerTest.java b/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/Tomcat9CachingClientServerTest.java
index 8e8b4c4..a02376c 100644
--- a/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/Tomcat9CachingClientServerTest.java
+++ b/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/Tomcat9CachingClientServerTest.java
@@ -23,6 +23,6 @@ public class Tomcat9CachingClientServerTest extends TomcatClientServerTest {
@Override
public ContainerInstall getInstall(IntSupplier portSupplier) throws Exception {
return new TomcatInstall(getClass().getSimpleName(), TOMCAT9, CACHING_CLIENT_SERVER,
- portSupplier);
+ portSupplier, TomcatInstall.CommitValve.DEFAULT);
}
}
diff --git a/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/Tomcat9CachingClientServerTest.java b/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/Tomcat9CachingClientServerValveDisabledTest.java
similarity index 89%
copy from geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/Tomcat9CachingClientServerTest.java
copy to geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/Tomcat9CachingClientServerValveDisabledTest.java
index 8e8b4c4..3738d9c 100644
--- a/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/Tomcat9CachingClientServerTest.java
+++ b/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/Tomcat9CachingClientServerValveDisabledTest.java
@@ -19,10 +19,10 @@ import static org.apache.geode.session.tests.TomcatInstall.TomcatVersion.TOMCAT9
import java.util.function.IntSupplier;
-public class Tomcat9CachingClientServerTest extends TomcatClientServerTest {
+public class Tomcat9CachingClientServerValveDisabledTest extends TomcatClientServerTest {
@Override
public ContainerInstall getInstall(IntSupplier portSupplier) throws Exception {
return new TomcatInstall(getClass().getSimpleName(), TOMCAT9, CACHING_CLIENT_SERVER,
- portSupplier);
+ portSupplier, TomcatInstall.CommitValve.DISABLED);
}
}
diff --git a/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/Tomcat9ClientServerTest.java b/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/Tomcat9ClientServerTest.java
index a617e19..f922d2b 100644
--- a/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/Tomcat9ClientServerTest.java
+++ b/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/Tomcat9ClientServerTest.java
@@ -23,6 +23,7 @@ public class Tomcat9ClientServerTest extends TomcatClientServerTest {
@Override
public ContainerInstall getInstall(IntSupplier portSupplier) throws Exception {
- return new TomcatInstall(getClass().getSimpleName(), TOMCAT9, CLIENT_SERVER, portSupplier);
+ return new TomcatInstall(getClass().getSimpleName(), TOMCAT9, CLIENT_SERVER, portSupplier,
+ TomcatInstall.CommitValve.DEFAULT);
}
}
diff --git a/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/Tomcat9Test.java b/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/Tomcat9Test.java
index b7777d1..cb65d56 100644
--- a/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/Tomcat9Test.java
+++ b/geode-assembly/src/distributedTest/java/org/apache/geode/session/tests/Tomcat9Test.java
@@ -22,6 +22,7 @@ import java.util.function.IntSupplier;
public class Tomcat9Test extends CargoTestBase {
@Override
public ContainerInstall getInstall(IntSupplier portSupplier) throws Exception {
- return new TomcatInstall(getClass().getSimpleName(), TOMCAT9, PEER_TO_PEER, portSupplier);
+ return new TomcatInstall(getClass().getSimpleName(), TOMCAT9, PEER_TO_PEER, portSupplier,
+ TomcatInstall.CommitValve.DEFAULT);
}
}
diff --git a/geode-assembly/src/upgradeTest/java/org/apache/geode/session/tests/Tomcat8ClientServerRollingUpgradeTest.java b/geode-assembly/src/upgradeTest/java/org/apache/geode/session/tests/Tomcat8ClientServerRollingUpgradeTest.java
index ec6c39c..be78750 100644
--- a/geode-assembly/src/upgradeTest/java/org/apache/geode/session/tests/Tomcat8ClientServerRollingUpgradeTest.java
+++ b/geode-assembly/src/upgradeTest/java/org/apache/geode/session/tests/Tomcat8ClientServerRollingUpgradeTest.java
@@ -136,12 +136,12 @@ public class Tomcat8ClientServerRollingUpgradeTest {
ContainerInstall.ConnectionType.CLIENT_SERVER,
oldModules.getAbsolutePath(),
oldBuild.getAbsolutePath() + "/lib",
- portSupplier::getAvailablePort);
+ portSupplier::getAvailablePort, TomcatInstall.CommitValve.DEFAULT);
tomcat8AndCurrentModules =
new TomcatInstall("Tomcat8AndCurrentModules", TomcatInstall.TomcatVersion.TOMCAT8,
ContainerInstall.ConnectionType.CLIENT_SERVER,
- portSupplier::getAvailablePort);
+ portSupplier::getAvailablePort, TomcatInstall.CommitValve.DEFAULT);
classPathTomcat8AndOldModules = getClassPathTomcat8AndOldModules();
diff --git a/geode-assembly/src/upgradeTest/java/org/apache/geode/session/tests/TomcatSessionBackwardsCompatibilityTestBase.java b/geode-assembly/src/upgradeTest/java/org/apache/geode/session/tests/TomcatSessionBackwardsCompatibilityTestBase.java
index 7c71b83..15dc1c8 100644
--- a/geode-assembly/src/upgradeTest/java/org/apache/geode/session/tests/TomcatSessionBackwardsCompatibilityTestBase.java
+++ b/geode-assembly/src/upgradeTest/java/org/apache/geode/session/tests/TomcatSessionBackwardsCompatibilityTestBase.java
@@ -120,24 +120,24 @@ public abstract class TomcatSessionBackwardsCompatibilityTestBase {
new TomcatInstall("Tomcat7079AndOldModules", TomcatInstall.TomcatVersion.TOMCAT7,
ContainerInstall.ConnectionType.CLIENT_SERVER,
oldModules.getAbsolutePath(), oldBuild.getAbsolutePath() + "/lib",
- portSupplier::getAvailablePort);
+ portSupplier::getAvailablePort, TomcatInstall.CommitValve.DEFAULT);
tomcat7079AndCurrentModules =
new TomcatInstall("Tomcat7079AndCurrentModules", TomcatInstall.TomcatVersion.TOMCAT7,
ContainerInstall.ConnectionType.CLIENT_SERVER,
- portSupplier::getAvailablePort);
+ portSupplier::getAvailablePort, TomcatInstall.CommitValve.DEFAULT);
tomcat8AndOldModules =
new TomcatInstall("Tomcat8AndOldModules", TomcatInstall.TomcatVersion.TOMCAT8,
ContainerInstall.ConnectionType.CLIENT_SERVER,
oldModules.getAbsolutePath(),
oldBuild.getAbsolutePath() + "/lib",
- portSupplier::getAvailablePort);
+ portSupplier::getAvailablePort, TomcatInstall.CommitValve.DEFAULT);
tomcat8AndCurrentModules =
new TomcatInstall("Tomcat8AndCurrentModules", TomcatInstall.TomcatVersion.TOMCAT8,
ContainerInstall.ConnectionType.CLIENT_SERVER,
- portSupplier::getAvailablePort);
+ portSupplier::getAvailablePort, TomcatInstall.CommitValve.DEFAULT);
classPathTomcat7079 = tomcat7079AndCurrentModules.getHome() + "/lib/*" + File.pathSeparator
+ tomcat7079AndCurrentModules.getHome() + "/bin/*";