mhansonp commented on code in PR #7608:
URL: https://github.com/apache/geode/pull/7608#discussion_r857892164
##########
geode-cq/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/DurableClientSimpleDUnitTest.java:
##########
@@ -1014,26 +1010,35 @@ public void testSimpleDurableClientMultipleServers() {
public void testDurableClientReceivedClientSessionInitialValue() {
// Start server 1
server1Port = server1VM
- .invoke(() -> CacheServerTestUtil.createCacheServer(regionName,
Boolean.TRUE));
+ .invoke(() -> CacheServerTestUtil.createCacheServer(regionName, true));
// Start server 2
int server2Port = server2VM
- .invoke(() -> CacheServerTestUtil.createCacheServer(regionName,
Boolean.TRUE));
+ .invoke(() -> CacheServerTestUtil.createCacheServer(regionName, true));
// Start normal publisher client
publisherClientVM.invoke(() -> CacheServerTestUtil
.createCacheClient(getClientPool(getServerHostName(),
server1Port, server2Port, false), regionName));
// Create an entry
- publishEntries(0, 1);
+ publishEntries(publisherClientVM, 0, 1);
// Start a durable client with the ControlListener
durableClientId = getName() + "_client";
- startupDurableClient(VERY_LONG_DURABLE_TIMEOUT_SECONDS,
- getClientPool(getServerHostName(), server1Port, server2Port,
- true),
- Boolean.TRUE);
+ durableClientVM.invoke(() -> createCacheClient(
+ getClientPool(getServerHostName(), server1Port, server2Port, true),
regionName,
+ getClientDistributedSystemProperties(durableClientId,
VERY_LONG_DURABLE_TIMEOUT_SECONDS),
+ true));
+
+ durableClientVM.invoke(() -> {
+ await().atMost(1 * HEAVY_TEST_LOAD_DELAY_SUPPORT_MULTIPLIER, MINUTES)
+ .pollInterval(100, MILLISECONDS)
+ .until(CacheServerTestUtil::getCache, notNullValue());
Review Comment:
done
##########
geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/DurableClientBug39997DUnitTest.java:
##########
@@ -50,81 +46,61 @@ public class DurableClientBug39997DUnitTest extends
JUnit4CacheTestCase {
@Override
public final void postTearDownCacheTestCase() {
-
Host.getHost(0).getVM(0).invoke(JUnit4DistributedTestCase::disconnectFromDS);
+ VM.getVM(0).invoke(JUnit4DistributedTestCase::disconnectFromDS);
}
@Test
public void testNoServerAvailableOnStartup() {
Host host = Host.getHost(0);
- VM vm0 = host.getVM(0);
- VM vm1 = host.getVM(1);
+ VM vm0 = VM.getVM(0);
+ VM vm1 = VM.getVM(1);
- final String hostName = NetworkUtils.getServerHostName(host);
+ final String hostName = VM.getHostName();
final int port = AvailablePortHelper.getRandomAvailableTCPPort();
- vm0.invoke(new SerializableRunnable("create cache") {
- @Override
- public void run() {
- getSystem(getClientProperties());
- PoolImpl p = (PoolImpl)
PoolManager.createFactory().addServer(hostName, port)
- .setSubscriptionEnabled(true).setSubscriptionRedundancy(0)
- .create("DurableClientReconnectDUnitTestPool");
- AttributesFactory factory = new AttributesFactory();
- factory.setScope(Scope.LOCAL);
- factory.setPoolName(p.getName());
- Cache cache = getCache();
- Region region1 = cache.createRegion("region", factory.create());
- cache.readyForEvents();
+ vm0.invoke("create cache", () -> {
+ getSystem(getClientProperties());
+ PoolImpl p = (PoolImpl) PoolManager.createFactory().addServer(hostName,
port)
+ .setSubscriptionEnabled(true).setSubscriptionRedundancy(0)
+ .create("DurableClientReconnectDUnitTestPool");
+ Cache cache = getCache();
+ RegionFactory regionFactory = cache.createRegionFactory();
+ regionFactory.setScope(Scope.LOCAL);
+ regionFactory.setPoolName(p.getName());
+ Region region1 = regionFactory.create("region");
- try {
- region1.registerInterest("ALL_KEYS");
- fail("Should have received an exception trying to register
interest");
- } catch (NoSubscriptionServersAvailableException expected) {
- // this is expected
- }
+ try {
+ region1.registerInterestForAllKeys();
+ fail("Should have received an exception trying to register interest");
+ } catch (NoSubscriptionServersAvailableException expected) {
+ // this is expected
}
});
- vm1.invoke(new SerializableRunnable() {
- @Override
- public void run() {
- Cache cache = getCache();
- AttributesFactory factory = new AttributesFactory();
- factory.setScope(Scope.DISTRIBUTED_ACK);
- cache.createRegion("region", factory.create());
- CacheServer server = cache.addCacheServer();
- server.setPort(port);
- try {
- server.start();
- } catch (IOException e) {
- Assert.fail("couldn't start server", e);
- }
+ vm1.invoke(() -> {
+ Cache cache = getCache();
+ RegionFactory regionFactory = cache.createRegionFactory();
+ regionFactory.setScope(Scope.DISTRIBUTED_ACK);
+ regionFactory.create("region");
+ CacheServer server = cache.addCacheServer();
+ server.setPort(port);
+ try {
+ server.start();
+ } catch (IOException e) {
+ fail("couldn't start server", e);
}
});
- vm0.invoke(new SerializableRunnable() {
- @Override
- public void run() {
- Cache cache = getCache();
- final Region region = cache.getRegion("region");
- GeodeAwaitility.await().untilAsserted(new WaitCriterion() {
-
- @Override
- public String description() {
- return "Wait for register interest to succeed";
- }
-
- @Override
- public boolean done() {
- try {
- region.registerInterest("ALL_KEYS");
- } catch (NoSubscriptionServersAvailableException e) {
- return false;
- }
- return true;
- }
-
- });
- }
+ vm0.invoke(() -> {
+ Cache cache = getCache();
+ final Region region = cache.getRegion("region");
+ GeodeAwaitility.await("Wait for register interest to succeed").until(()
-> {
+ try {
+ region.registerInterestForAllKeys();
Review Comment:
done
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscr...@geode.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
