You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@geode.apache.org by GitBox <gi...@apache.org> on 2020/05/15 18:57:09 UTC
[GitHub] [geode] agingade opened a new pull request #4987: GEODE-7678: Support for cache-listener and client-notification for Partitioned Region Clear operation.
agingade opened a new pull request #4987:
URL: https://github.com/apache/geode/pull/4987
The changes are made to PR clear messaging and locking mechanism to preserve
cache-listener and client-events ordering during concurrent cache operation
while clear in progress.
Thank you for submitting a contribution to Apache Geode.
In order to streamline the review of the contribution we ask you
to ensure the following steps have been taken:
### For all changes:
- [Y] Is there a JIRA ticket associated with this PR? Is it referenced in the commit message?
- [Y] Has your PR been rebased against the latest commit within the target branch (typically `develop`)?
- [Y] Is your initial contribution a single, squashed commit?
- [Y] Does `gradlew build` run cleanly?
- [Y] Have you written or updated unit tests to verify your changes?
- [NA] If adding new dependencies to the code, are these dependencies licensed in a way that is compatible for inclusion under [ASF 2.0](http://www.apache.org/legal/resolved.html#category-a)?
### Note:
Please ensure that once the PR is submitted, check Concourse for build issues and
submit an update to your PR as soon as possible. If you need help, please send an
email to dev@geode.apache.org.
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [geode] agingade commented on a change in pull request #4987: GEODE-7678: Support for cache-listener and client-notification for Partitioned Region Clear operation.
Posted by GitBox <gi...@apache.org>.
agingade commented on a change in pull request #4987:
URL: https://github.com/apache/geode/pull/4987#discussion_r417692159
##########
File path: geode-core/src/distributedTest/java/org/apache/geode/cache/ReplicateCacheListenerDistributedTest.java
##########
@@ -302,4 +349,64 @@ public void afterDestroy(final EntryEvent<String, Integer> event) {
errorCollector.checkThat(event.getNewValue(), nullValue());
}
}
+
+ protected class ClearCountingCacheListener extends BaseCacheListener {
+
+ @Override
+ public void afterCreate(final EntryEvent<String, Integer> event) {
+ sharedCountersRule.increment(CREATES);
+ }
+
+ @Override
+ public void afterUpdate(final EntryEvent<String, Integer> event) {
+ sharedCountersRule.increment(UPDATES);
+ }
+
+ @Override
+ public void afterRegionClear(RegionEvent<String, Integer> event) {
+
+ sharedCountersRule.increment(CLEAR);
+ if (!event.getRegion().getAttributes().getDataPolicy().withPartitioning()) {
+ if (event.isOriginRemote()) {
+ errorCollector.checkThat(event.getDistributedMember(),
+ not(cacheRule.getSystem().getDistributedMember()));
+ } else {
+ errorCollector.checkThat(event.getDistributedMember(),
+ equalTo(cacheRule.getSystem().getDistributedMember()));
+ }
+ }
+ errorCollector.checkThat(event.getOperation(), equalTo(Operation.REGION_CLEAR));
+ errorCollector.checkThat(event.getRegion().getName(), equalTo(regionName));
+ }
+ }
+
+ protected class RegionDestroyCountingCacheListener extends BaseCacheListener {
+
+ @Override
+ public void afterCreate(final EntryEvent<String, Integer> event) {
+ sharedCountersRule.increment(CREATES);
+ }
+
+ @Override
+ public void afterUpdate(final EntryEvent<String, Integer> event) {
+ sharedCountersRule.increment(UPDATES);
+ }
+
+ @Override
+ public void afterRegionDestroy(final RegionEvent<String, Integer> event) {
+ sharedCountersRule.increment(REGION_DESTROY);
+
+ if (!event.getRegion().getAttributes().getDataPolicy().withPartitioning()) {
+ if (event.isOriginRemote()) {
+ errorCollector.checkThat(event.getDistributedMember(),
+ not(cacheRule.getSystem().getDistributedMember()));
+ } else {
+ errorCollector.checkThat(event.getDistributedMember(),
+ equalTo(cacheRule.getSystem().getDistributedMember()));
+ }
+ }
Review comment:
In the tests, i have seen both types of implementation, where keeping duplicate code in the test, so that its easier to understand the test and modify that specific test. In this case, i will keep it separate and as i commented for Donal's earlier review we can come back to this test and refactor it.
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [geode] agingade commented on a change in pull request #4987: GEODE-7678: Support for cache-listener and client-notification for Partitioned Region Clear operation.
Posted by GitBox <gi...@apache.org>.
agingade commented on a change in pull request #4987:
URL: https://github.com/apache/geode/pull/4987#discussion_r417709662
##########
File path: geode-core/src/main/java/org/apache/geode/internal/cache/ClearPartitionedRegion.java
##########
@@ -0,0 +1,379 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.geode.internal.cache;
+
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Iterator;
+
+import org.apache.logging.log4j.Logger;
+
+import org.apache.geode.CancelException;
+import org.apache.geode.cache.Operation;
+import org.apache.geode.cache.partition.PartitionRegionHelper;
+import org.apache.geode.distributed.internal.DistributionManager;
+import org.apache.geode.distributed.internal.MembershipListener;
+import org.apache.geode.distributed.internal.ReplyException;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.cache.versions.RegionVersionVector;
+import org.apache.geode.logging.internal.log4j.api.LogService;
+
+public class ClearPartitionedRegion {
+
+ private static final Logger logger = LogService.getLogger();
+
+ private final PartitionedRegion partitionedRegion;
+
+ private LockForListenerAndClientNotification lockForListenerAndClientNotification =
+ new LockForListenerAndClientNotification();
+
+ private volatile boolean membershipchange = false;
+
+ public ClearPartitionedRegion(PartitionedRegion partitionedRegion) {
+ this.partitionedRegion = partitionedRegion;
+ partitionedRegion.getDistributionManager()
+ .addMembershipListener(new ClearPartitionedRegionListener());
+ }
+
+ public boolean isLockedForListenerAndClientNotification() {
+ return lockForListenerAndClientNotification.isLocked();
+ }
+
+ void acquireDistributedClearLock(String clearLock) {
+ try {
+ partitionedRegion.getPartitionedRegionLockService().lock(clearLock, -1, -1);
+ } catch (IllegalStateException e) {
+ partitionedRegion.lockCheckReadiness();
+ throw e;
+ }
+ }
+
+ void releaseDistributedClearLock(String clearLock) {
+ try {
+ partitionedRegion.getPartitionedRegionLockService().unlock(clearLock);
+ } catch (IllegalStateException e) {
+ partitionedRegion.lockCheckReadiness();
+ } catch (Exception ex) {
+ logger.warn("Caught exception while unlocking clear distributed lock", ex.getMessage());
+ }
+ }
+
+ void obtainLockForClear(RegionEventImpl event) {
+ sendClearRegionMessage(event,
+ ClearPartitionedRegionMessage.OperationType.OP_LOCK_FOR_PR_CLEAR);
+ obtainClearLockLocal(partitionedRegion.getDistributionManager().getId());
+ }
+
+ void releaseLockForClear(RegionEventImpl event) {
+ sendClearRegionMessage(event,
+ ClearPartitionedRegionMessage.OperationType.OP_UNLOCK_FOR_PR_CLEAR);
+ releaseClearLockLocal();
+ }
+
+ void clearRegion(RegionEventImpl regionEvent, boolean cacheWrite,
+ RegionVersionVector vector) {
+ clearRegionLocal(regionEvent, cacheWrite, null);
+ sendClearRegionMessage(regionEvent,
+ ClearPartitionedRegionMessage.OperationType.OP_PR_CLEAR);
+ }
+
+ private void waitForPrimary() {
+ boolean retry;
+ int retryTime = 2 * 60 * 1000 /* partitionedRegion.getRetryTimeout() */;
+ PartitionedRegion.RetryTimeKeeper retryTimer = new PartitionedRegion.RetryTimeKeeper(retryTime);
+ do {
+ retry = false;
+ for (BucketRegion bucketRegion : partitionedRegion.getDataStore()
+ .getAllLocalBucketRegions()) {
+ if (!bucketRegion.getBucketAdvisor().hasPrimary()) {
+ if (retryTimer.overMaximum()) {
+ PRHARedundancyProvider.timedOut(partitionedRegion, null, null,
+ "do clear. Missing primary bucket",
+ retryTime);
+ }
+ retryTimer.waitForBucketsRecovery();
+ retry = true;
+ }
+ }
+ } while (retry);
+ }
+
+ public void clearRegionLocal(RegionEventImpl regionEvent, boolean cacheWrite,
+ RegionVersionVector vector) {
+ // Synchronized to handle the requester departure.
+ synchronized (lockForListenerAndClientNotification) {
+ if (partitionedRegion.getDataStore() != null) {
+ partitionedRegion.getDataStore().lockBucketCreationForRegionClear();
+ try {
+ boolean retry;
+ do {
+ retry = false;
+ for (BucketRegion localPrimaryBucketRegion : partitionedRegion.getDataStore()
+ .getAllLocalPrimaryBucketRegions()) {
+ if (localPrimaryBucketRegion.size() > 0) {
+ localPrimaryBucketRegion.clear();
+ }
+ }
+ if (membershipchange) {
+ membershipchange = false;
+ retry = true;
+ waitForPrimary();
Review comment:
The retry should happen with the membership change. We know or could estimate approximate time it takes to elect a secondary to primary when there is a member departure; the reason it is in the waitForPrimary. If we encounter timeout with clear; we need to adjust the timeout; similar approach is used other time consuming operation.
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [geode] gesterzhou commented on a change in pull request #4987: GEODE-7678: Support for cache-listener and client-notification for Partitioned Region Clear operation.
Posted by GitBox <gi...@apache.org>.
gesterzhou commented on a change in pull request #4987:
URL: https://github.com/apache/geode/pull/4987#discussion_r414757960
##########
File path: geode-core/src/main/java/org/apache/geode/internal/cache/ClearPartitionedRegion.java
##########
@@ -0,0 +1,347 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.geode.internal.cache;
+
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Iterator;
+
+import org.apache.logging.log4j.Logger;
+
+import org.apache.geode.CancelException;
+import org.apache.geode.cache.Operation;
+import org.apache.geode.cache.partition.PartitionRegionHelper;
+import org.apache.geode.distributed.internal.DistributionManager;
+import org.apache.geode.distributed.internal.MembershipListener;
+import org.apache.geode.distributed.internal.ReplyException;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.cache.versions.RegionVersionVector;
+import org.apache.geode.logging.internal.log4j.api.LogService;
+
+public class ClearPartitionedRegion {
+
+ private static final Logger logger = LogService.getLogger();
+
+ private final PartitionedRegion partitionedRegion;
+
+ private LockForListenerAndClientNotification lockForListenerAndClientNotification =
+ new LockForListenerAndClientNotification();
+
+ public ClearPartitionedRegion(PartitionedRegion partitionedRegion) {
+ this.partitionedRegion = partitionedRegion;
+ partitionedRegion.getDistributionManager()
+ .addMembershipListener(new ClearPartitionedRegionListener());
+ }
+
+ public boolean isLockedForListenerAndClientNotification() {
+ return lockForListenerAndClientNotification.isLocked();
+ }
+
+ void acquireDistributedClearLock(String clearLock) {
+ try {
+ partitionedRegion.getPartitionedRegionLockService().lock(clearLock, -1, -1);
+ } catch (IllegalStateException e) {
+ partitionedRegion.lockCheckReadiness();
+ throw e;
+ }
+ }
+
+ void releaseDistributedClearLock(String clearLock) {
+ try {
+ partitionedRegion.getPartitionedRegionLockService().unlock(clearLock);
+ } catch (IllegalStateException e) {
+ partitionedRegion.lockCheckReadiness();
+ } catch (Exception ex) {
+ logger.warn("Caught exception while unlocking clear distributed lock", ex.getMessage());
+ }
+ }
+
+ void obtainWriteLockForClear(RegionEventImpl event) {
+ sendLocalClearRegionMessage(event,
+ ClearPartitionedRegionMessage.OperationType.OP_LOCK_FOR_CLEAR);
+ obtainClearLockLocal(partitionedRegion.getDistributionManager().getId());
+ }
+
+ void releaseWriteLockForClear(RegionEventImpl event) {
+ sendLocalClearRegionMessage(event,
+ ClearPartitionedRegionMessage.OperationType.OP_UNLOCK_FOR_CLEAR);
+ releaseClearLockLocal();
+ }
+
+ void clearRegion(RegionEventImpl regionEvent, boolean cacheWrite,
+ RegionVersionVector vector) {
+ clearRegionLocal(regionEvent, cacheWrite, null);
+ sendLocalClearRegionMessage(regionEvent,
Review comment:
sendLocalClearRegionMessage() method is shared by all the 3 mesgs: obtainWriteLockForClear, clearRegion, releaseWriteLockForClear. So it's better to rename it to sendPRClearOperationMessage, or other generic name. It should not be "LocalClear".
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [geode] jujoramos commented on a change in pull request #4987: GEODE-7678: Support for cache-listener and client-notification for Partitioned Region Clear operation.
Posted by GitBox <gi...@apache.org>.
jujoramos commented on a change in pull request #4987:
URL: https://github.com/apache/geode/pull/4987#discussion_r417216163
##########
File path: geode-core/src/distributedTest/java/org/apache/geode/cache/ReplicateCacheListenerDistributedTest.java
##########
@@ -302,4 +349,64 @@ public void afterDestroy(final EntryEvent<String, Integer> event) {
errorCollector.checkThat(event.getNewValue(), nullValue());
}
}
+
+ protected class ClearCountingCacheListener extends BaseCacheListener {
+
+ @Override
+ public void afterCreate(final EntryEvent<String, Integer> event) {
+ sharedCountersRule.increment(CREATES);
+ }
+
+ @Override
+ public void afterUpdate(final EntryEvent<String, Integer> event) {
+ sharedCountersRule.increment(UPDATES);
+ }
+
+ @Override
+ public void afterRegionClear(RegionEvent<String, Integer> event) {
+
+ sharedCountersRule.increment(CLEAR);
+ if (!event.getRegion().getAttributes().getDataPolicy().withPartitioning()) {
+ if (event.isOriginRemote()) {
+ errorCollector.checkThat(event.getDistributedMember(),
+ not(cacheRule.getSystem().getDistributedMember()));
+ } else {
+ errorCollector.checkThat(event.getDistributedMember(),
+ equalTo(cacheRule.getSystem().getDistributedMember()));
+ }
+ }
+ errorCollector.checkThat(event.getOperation(), equalTo(Operation.REGION_CLEAR));
+ errorCollector.checkThat(event.getRegion().getName(), equalTo(regionName));
+ }
+ }
+
+ protected class RegionDestroyCountingCacheListener extends BaseCacheListener {
+
+ @Override
+ public void afterCreate(final EntryEvent<String, Integer> event) {
+ sharedCountersRule.increment(CREATES);
+ }
+
+ @Override
+ public void afterUpdate(final EntryEvent<String, Integer> event) {
+ sharedCountersRule.increment(UPDATES);
+ }
+
+ @Override
+ public void afterRegionDestroy(final RegionEvent<String, Integer> event) {
+ sharedCountersRule.increment(REGION_DESTROY);
+
+ if (!event.getRegion().getAttributes().getDataPolicy().withPartitioning()) {
+ if (event.isOriginRemote()) {
+ errorCollector.checkThat(event.getDistributedMember(),
+ not(cacheRule.getSystem().getDistributedMember()));
+ } else {
+ errorCollector.checkThat(event.getDistributedMember(),
+ equalTo(cacheRule.getSystem().getDistributedMember()));
+ }
+ }
Review comment:
This code is duplicated in the test class, maybe better to extract this to its own method?.
##########
File path: geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionAfterClearNotificationDUnitTest.java
##########
@@ -0,0 +1,388 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.geode.internal.cache;
+
+import static java.util.concurrent.TimeUnit.SECONDS;
+import static org.apache.geode.internal.Assert.fail;
+import static org.apache.geode.test.dunit.rules.ClusterStartupRule.getCache;
+import static org.apache.geode.test.dunit.rules.ClusterStartupRule.getClientCache;
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.Properties;
+import java.util.concurrent.TimeoutException;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.stream.IntStream;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+
+import org.apache.geode.cache.InterestResultPolicy;
+import org.apache.geode.cache.PartitionAttributesFactory;
+import org.apache.geode.cache.Region;
+import org.apache.geode.cache.RegionEvent;
+import org.apache.geode.cache.RegionShortcut;
+import org.apache.geode.cache.client.ClientRegionShortcut;
+import org.apache.geode.cache.server.CacheServer;
+import org.apache.geode.cache.util.CacheListenerAdapter;
+import org.apache.geode.distributed.internal.ClusterDistributionManager;
+import org.apache.geode.distributed.internal.DistributionMessage;
+import org.apache.geode.distributed.internal.DistributionMessageObserver;
+import org.apache.geode.test.awaitility.GeodeAwaitility;
+import org.apache.geode.test.dunit.AsyncInvocation;
+import org.apache.geode.test.dunit.DUnitBlackboard;
+import org.apache.geode.test.dunit.SerializableCallableIF;
+import org.apache.geode.test.dunit.rules.ClientVM;
+import org.apache.geode.test.dunit.rules.ClusterStartupRule;
+import org.apache.geode.test.dunit.rules.MemberVM;
+
+public class PartitionedRegionAfterClearNotificationDUnitTest implements Serializable {
+ protected static final String REGION_NAME = "testPR";
+ protected static final int NUM_ENTRIES = 100;
+
+ protected int locatorPort;
+ protected MemberVM locator;
+ protected MemberVM dataStore1, dataStore2, dataStore3, accessor;
+ protected ClientVM client1, client2;
+
+ private static final Logger logger = LogManager.getLogger();
Review comment:
You can delete this field as it's not used.
##########
File path: geode-core/src/distributedTest/java/org/apache/geode/cache/PRCacheListenerDistributedTest.java
##########
@@ -38,22 +45,57 @@
@SuppressWarnings("serial")
public class PRCacheListenerDistributedTest extends ReplicateCacheListenerDistributedTest {
- @Parameters(name = "{index}: redundancy={0}")
- public static Iterable<Integer> data() {
- return Arrays.asList(0, 3);
+ @Parameters
+ public static Collection<Object[]> data() {
+ return Arrays.asList(new Object[][] {
+ {1, Boolean.FALSE},
+ {3, Boolean.TRUE},
+ });
}
@Parameter
public int redundancy;
+ @Parameter(1)
+ public Boolean withData;
+
@Override
protected Region<String, Integer> createRegion(final String name,
final CacheListener<String, Integer> listener) {
+ LogService.getLogger()
+ .info("Params [Redundancy: " + redundancy + " withData:" + withData + "]");
PartitionAttributesFactory<String, Integer> paf = new PartitionAttributesFactory<>();
paf.setRedundantCopies(redundancy);
RegionFactory<String, Integer> regionFactory = cacheRule.getCache().createRegionFactory();
- regionFactory.addCacheListener(listener);
+ if (listener != null) {
+ regionFactory.addCacheListener(listener);
+ }
+ regionFactory.setDataPolicy(DataPolicy.PARTITION);
+ regionFactory.setPartitionAttributes(paf.create());
+
+ return regionFactory.create(name);
Review comment:
This code is duplicated in the test class, maybe better to extract this to its own method?.
##########
File path: geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionAfterClearNotificationDUnitTest.java
##########
@@ -0,0 +1,388 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.geode.internal.cache;
+
+import static java.util.concurrent.TimeUnit.SECONDS;
+import static org.apache.geode.internal.Assert.fail;
+import static org.apache.geode.test.dunit.rules.ClusterStartupRule.getCache;
+import static org.apache.geode.test.dunit.rules.ClusterStartupRule.getClientCache;
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.Properties;
+import java.util.concurrent.TimeoutException;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.stream.IntStream;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+
+import org.apache.geode.cache.InterestResultPolicy;
+import org.apache.geode.cache.PartitionAttributesFactory;
+import org.apache.geode.cache.Region;
+import org.apache.geode.cache.RegionEvent;
+import org.apache.geode.cache.RegionShortcut;
+import org.apache.geode.cache.client.ClientRegionShortcut;
+import org.apache.geode.cache.server.CacheServer;
+import org.apache.geode.cache.util.CacheListenerAdapter;
+import org.apache.geode.distributed.internal.ClusterDistributionManager;
+import org.apache.geode.distributed.internal.DistributionMessage;
+import org.apache.geode.distributed.internal.DistributionMessageObserver;
+import org.apache.geode.test.awaitility.GeodeAwaitility;
+import org.apache.geode.test.dunit.AsyncInvocation;
+import org.apache.geode.test.dunit.DUnitBlackboard;
+import org.apache.geode.test.dunit.SerializableCallableIF;
+import org.apache.geode.test.dunit.rules.ClientVM;
+import org.apache.geode.test.dunit.rules.ClusterStartupRule;
+import org.apache.geode.test.dunit.rules.MemberVM;
+
+public class PartitionedRegionAfterClearNotificationDUnitTest implements Serializable {
+ protected static final String REGION_NAME = "testPR";
+ protected static final int NUM_ENTRIES = 100;
+
+ protected int locatorPort;
+ protected MemberVM locator;
+ protected MemberVM dataStore1, dataStore2, dataStore3, accessor;
+ protected ClientVM client1, client2;
+
+ private static final Logger logger = LogManager.getLogger();
+
+ private static volatile DUnitBlackboard blackboard;
+
+ @Rule
+ public ClusterStartupRule cluster = new ClusterStartupRule(7);
+
+ @Before
+ public void setUp() throws Exception {
+ locator = cluster.startLocatorVM(0);
+ locatorPort = locator.getPort();
+ dataStore1 = cluster.startServerVM(1, getProperties(), locatorPort);
+ dataStore2 = cluster.startServerVM(2, getProperties(), locatorPort);
+ dataStore3 = cluster.startServerVM(3, getProperties(), locatorPort);
+ accessor = cluster.startServerVM(4, getProperties(), locatorPort);
+
+ client1 = cluster.startClientVM(5,
+ c -> c.withPoolSubscription(true).withLocatorConnection((locatorPort)));
+ client2 = cluster.startClientVM(6,
+ c -> c.withPoolSubscription(true).withLocatorConnection((locatorPort)));
+
+ dataStore1.invoke(this::initDataStore);
+ dataStore2.invoke(this::initDataStore);
+ dataStore3.invoke(this::initDataStore);
+ accessor.invoke(this::initAccessor);
+
+ getBlackboard().initBlackboard();
+ }
+
+ protected RegionShortcut getRegionShortCut() {
+ return RegionShortcut.PARTITION_REDUNDANT;
+ }
+
+ protected Properties getProperties() {
+ Properties properties = new Properties();
+ // properties.setProperty("log-level", "info");
+ return properties;
+ }
+
+ private Region getRegion(boolean isClient) {
+ if (isClient) {
+ return getClientCache().getRegion(REGION_NAME);
+ } else {
+ return getCache().getRegion(REGION_NAME);
+ }
+ }
+
+ private void verifyRegionSize(boolean isClient, int expectedNum) {
+ GeodeAwaitility.await().atMost(10, SECONDS)
Review comment:
Any reason for overriding the default `GeodeAwaitility` timeout?, maybe we should leave the default to avoid flakiness (for those cases there's a resource contention while running the tests)?.
##########
File path: geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionAfterClearNotificationDUnitTest.java
##########
@@ -0,0 +1,388 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.geode.internal.cache;
+
+import static java.util.concurrent.TimeUnit.SECONDS;
+import static org.apache.geode.internal.Assert.fail;
+import static org.apache.geode.test.dunit.rules.ClusterStartupRule.getCache;
+import static org.apache.geode.test.dunit.rules.ClusterStartupRule.getClientCache;
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.Properties;
+import java.util.concurrent.TimeoutException;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.stream.IntStream;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+
+import org.apache.geode.cache.InterestResultPolicy;
+import org.apache.geode.cache.PartitionAttributesFactory;
+import org.apache.geode.cache.Region;
+import org.apache.geode.cache.RegionEvent;
+import org.apache.geode.cache.RegionShortcut;
+import org.apache.geode.cache.client.ClientRegionShortcut;
+import org.apache.geode.cache.server.CacheServer;
+import org.apache.geode.cache.util.CacheListenerAdapter;
+import org.apache.geode.distributed.internal.ClusterDistributionManager;
+import org.apache.geode.distributed.internal.DistributionMessage;
+import org.apache.geode.distributed.internal.DistributionMessageObserver;
+import org.apache.geode.test.awaitility.GeodeAwaitility;
+import org.apache.geode.test.dunit.AsyncInvocation;
+import org.apache.geode.test.dunit.DUnitBlackboard;
+import org.apache.geode.test.dunit.SerializableCallableIF;
+import org.apache.geode.test.dunit.rules.ClientVM;
+import org.apache.geode.test.dunit.rules.ClusterStartupRule;
+import org.apache.geode.test.dunit.rules.MemberVM;
+
+public class PartitionedRegionAfterClearNotificationDUnitTest implements Serializable {
+ protected static final String REGION_NAME = "testPR";
+ protected static final int NUM_ENTRIES = 100;
+
+ protected int locatorPort;
+ protected MemberVM locator;
+ protected MemberVM dataStore1, dataStore2, dataStore3, accessor;
+ protected ClientVM client1, client2;
+
+ private static final Logger logger = LogManager.getLogger();
+
+ private static volatile DUnitBlackboard blackboard;
+
+ @Rule
+ public ClusterStartupRule cluster = new ClusterStartupRule(7);
+
+ @Before
+ public void setUp() throws Exception {
+ locator = cluster.startLocatorVM(0);
+ locatorPort = locator.getPort();
+ dataStore1 = cluster.startServerVM(1, getProperties(), locatorPort);
+ dataStore2 = cluster.startServerVM(2, getProperties(), locatorPort);
+ dataStore3 = cluster.startServerVM(3, getProperties(), locatorPort);
+ accessor = cluster.startServerVM(4, getProperties(), locatorPort);
+
+ client1 = cluster.startClientVM(5,
+ c -> c.withPoolSubscription(true).withLocatorConnection((locatorPort)));
+ client2 = cluster.startClientVM(6,
+ c -> c.withPoolSubscription(true).withLocatorConnection((locatorPort)));
+
+ dataStore1.invoke(this::initDataStore);
+ dataStore2.invoke(this::initDataStore);
+ dataStore3.invoke(this::initDataStore);
+ accessor.invoke(this::initAccessor);
+
+ getBlackboard().initBlackboard();
+ }
+
+ protected RegionShortcut getRegionShortCut() {
+ return RegionShortcut.PARTITION_REDUNDANT;
+ }
+
+ protected Properties getProperties() {
+ Properties properties = new Properties();
+ // properties.setProperty("log-level", "info");
+ return properties;
+ }
+
+ private Region getRegion(boolean isClient) {
+ if (isClient) {
+ return getClientCache().getRegion(REGION_NAME);
+ } else {
+ return getCache().getRegion(REGION_NAME);
+ }
+ }
+
+ private void verifyRegionSize(boolean isClient, int expectedNum) {
+ GeodeAwaitility.await().atMost(10, SECONDS)
+ .untilAsserted(() -> assertThat(getRegion(isClient).size()).isEqualTo(expectedNum));
+ }
+
+ private void initClientCache() {
+ Region region = getClientCache().createClientRegionFactory(ClientRegionShortcut.CACHING_PROXY)
+ .create(REGION_NAME);
+ region.registerInterestForAllKeys(InterestResultPolicy.KEYS);
+ }
+
+ private void stopServers() {
+ List<CacheServer> cacheServers = getCache().getCacheServers();
+ for (CacheServer server : cacheServers) {
+ server.stop();
+ }
+ }
+
+ private void initDataStore() {
+ getCache().createRegionFactory(getRegionShortCut())
+ .setPartitionAttributes(new PartitionAttributesFactory().setTotalNumBuckets(10).create())
+ .addCacheListener(new CountingCacheListener())
+ .create(REGION_NAME);
+ }
+
+ private void initAccessor() {
+ RegionShortcut shortcut = getRegionShortCut();
+ if (shortcut.isPersistent()) {
+ if (shortcut == RegionShortcut.PARTITION_PERSISTENT) {
+ shortcut = RegionShortcut.PARTITION;
+ } else if (shortcut == RegionShortcut.PARTITION_PERSISTENT_OVERFLOW) {
+ shortcut = RegionShortcut.PARTITION_OVERFLOW;
+ } else if (shortcut == RegionShortcut.PARTITION_REDUNDANT_PERSISTENT) {
+ shortcut = RegionShortcut.PARTITION_REDUNDANT;
+ } else if (shortcut == RegionShortcut.PARTITION_REDUNDANT_PERSISTENT_OVERFLOW) {
+ shortcut = RegionShortcut.PARTITION_REDUNDANT_OVERFLOW;
+ } else {
+ fail("Wrong region type:" + shortcut);
Review comment:
Can we throw an exception here instead of using the `fail` method?.
##########
File path: geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionAfterClearNotificationDUnitTest.java
##########
@@ -0,0 +1,388 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.geode.internal.cache;
+
+import static java.util.concurrent.TimeUnit.SECONDS;
+import static org.apache.geode.internal.Assert.fail;
+import static org.apache.geode.test.dunit.rules.ClusterStartupRule.getCache;
+import static org.apache.geode.test.dunit.rules.ClusterStartupRule.getClientCache;
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.Properties;
+import java.util.concurrent.TimeoutException;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.stream.IntStream;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+
+import org.apache.geode.cache.InterestResultPolicy;
+import org.apache.geode.cache.PartitionAttributesFactory;
+import org.apache.geode.cache.Region;
+import org.apache.geode.cache.RegionEvent;
+import org.apache.geode.cache.RegionShortcut;
+import org.apache.geode.cache.client.ClientRegionShortcut;
+import org.apache.geode.cache.server.CacheServer;
+import org.apache.geode.cache.util.CacheListenerAdapter;
+import org.apache.geode.distributed.internal.ClusterDistributionManager;
+import org.apache.geode.distributed.internal.DistributionMessage;
+import org.apache.geode.distributed.internal.DistributionMessageObserver;
+import org.apache.geode.test.awaitility.GeodeAwaitility;
+import org.apache.geode.test.dunit.AsyncInvocation;
+import org.apache.geode.test.dunit.DUnitBlackboard;
+import org.apache.geode.test.dunit.SerializableCallableIF;
+import org.apache.geode.test.dunit.rules.ClientVM;
+import org.apache.geode.test.dunit.rules.ClusterStartupRule;
+import org.apache.geode.test.dunit.rules.MemberVM;
+
+public class PartitionedRegionAfterClearNotificationDUnitTest implements Serializable {
+ protected static final String REGION_NAME = "testPR";
+ protected static final int NUM_ENTRIES = 100;
+
+ protected int locatorPort;
+ protected MemberVM locator;
+ protected MemberVM dataStore1, dataStore2, dataStore3, accessor;
+ protected ClientVM client1, client2;
+
+ private static final Logger logger = LogManager.getLogger();
+
+ private static volatile DUnitBlackboard blackboard;
+
+ @Rule
+ public ClusterStartupRule cluster = new ClusterStartupRule(7);
+
+ @Before
+ public void setUp() throws Exception {
+ locator = cluster.startLocatorVM(0);
+ locatorPort = locator.getPort();
+ dataStore1 = cluster.startServerVM(1, getProperties(), locatorPort);
+ dataStore2 = cluster.startServerVM(2, getProperties(), locatorPort);
+ dataStore3 = cluster.startServerVM(3, getProperties(), locatorPort);
+ accessor = cluster.startServerVM(4, getProperties(), locatorPort);
+
+ client1 = cluster.startClientVM(5,
+ c -> c.withPoolSubscription(true).withLocatorConnection((locatorPort)));
+ client2 = cluster.startClientVM(6,
+ c -> c.withPoolSubscription(true).withLocatorConnection((locatorPort)));
+
+ dataStore1.invoke(this::initDataStore);
+ dataStore2.invoke(this::initDataStore);
+ dataStore3.invoke(this::initDataStore);
+ accessor.invoke(this::initAccessor);
+
+ getBlackboard().initBlackboard();
+ }
+
+ protected RegionShortcut getRegionShortCut() {
+ return RegionShortcut.PARTITION_REDUNDANT;
+ }
+
+ protected Properties getProperties() {
+ Properties properties = new Properties();
+ // properties.setProperty("log-level", "info");
+ return properties;
+ }
+
+ private Region getRegion(boolean isClient) {
+ if (isClient) {
+ return getClientCache().getRegion(REGION_NAME);
+ } else {
+ return getCache().getRegion(REGION_NAME);
+ }
+ }
+
+ private void verifyRegionSize(boolean isClient, int expectedNum) {
+ GeodeAwaitility.await().atMost(10, SECONDS)
+ .untilAsserted(() -> assertThat(getRegion(isClient).size()).isEqualTo(expectedNum));
+ }
+
+ private void initClientCache() {
+ Region region = getClientCache().createClientRegionFactory(ClientRegionShortcut.CACHING_PROXY)
+ .create(REGION_NAME);
+ region.registerInterestForAllKeys(InterestResultPolicy.KEYS);
+ }
+
+ private void stopServers() {
+ List<CacheServer> cacheServers = getCache().getCacheServers();
+ for (CacheServer server : cacheServers) {
+ server.stop();
+ }
+ }
+
+ private void initDataStore() {
+ getCache().createRegionFactory(getRegionShortCut())
+ .setPartitionAttributes(new PartitionAttributesFactory().setTotalNumBuckets(10).create())
+ .addCacheListener(new CountingCacheListener())
+ .create(REGION_NAME);
+ }
+
+ private void initAccessor() {
+ RegionShortcut shortcut = getRegionShortCut();
+ if (shortcut.isPersistent()) {
+ if (shortcut == RegionShortcut.PARTITION_PERSISTENT) {
+ shortcut = RegionShortcut.PARTITION;
+ } else if (shortcut == RegionShortcut.PARTITION_PERSISTENT_OVERFLOW) {
+ shortcut = RegionShortcut.PARTITION_OVERFLOW;
+ } else if (shortcut == RegionShortcut.PARTITION_REDUNDANT_PERSISTENT) {
+ shortcut = RegionShortcut.PARTITION_REDUNDANT;
+ } else if (shortcut == RegionShortcut.PARTITION_REDUNDANT_PERSISTENT_OVERFLOW) {
+ shortcut = RegionShortcut.PARTITION_REDUNDANT_OVERFLOW;
+ } else {
+ fail("Wrong region type:" + shortcut);
+ }
+ }
+ getCache().createRegionFactory(shortcut)
+ .setPartitionAttributes(
+ new PartitionAttributesFactory().setTotalNumBuckets(10).setLocalMaxMemory(0).create())
+ .addCacheListener(new CountingCacheListener())
+ .create(REGION_NAME);
+ }
+
+ private void feed(boolean isClient) {
+ Region region = getRegion(isClient);
+ IntStream.range(0, NUM_ENTRIES).forEach(i -> region.put(i, "value" + i));
+ }
+
+ private void verifyServerRegionSize(int expectedNum) {
+ accessor.invoke(() -> verifyRegionSize(false, expectedNum));
+ dataStore1.invoke(() -> verifyRegionSize(false, expectedNum));
+ dataStore2.invoke(() -> verifyRegionSize(false, expectedNum));
+ dataStore3.invoke(() -> verifyRegionSize(false, expectedNum));
+ }
+
+ private void verifyClientRegionSize(int expectedNum) {
+ client1.invoke(() -> verifyRegionSize(true, expectedNum));
+ client2.invoke(() -> verifyRegionSize(true, expectedNum));
+ }
+
+ private void verifyCacheListenerTriggerCount(MemberVM serverVM) {
+ SerializableCallableIF<Integer> getListenerTriggerCount = () -> {
+ CountingCacheListener countingCacheListener =
+ (CountingCacheListener) getRegion(false).getAttributes()
+ .getCacheListeners()[0];
+ return countingCacheListener.getClears();
+ };
+
+ int count = accessor.invoke(getListenerTriggerCount)
+ + dataStore1.invoke(getListenerTriggerCount)
+ + dataStore2.invoke(getListenerTriggerCount)
+ + dataStore3.invoke(getListenerTriggerCount);
+ assertThat(count).isEqualTo(4);
+
+ if (serverVM != null) {
+ assertThat(serverVM.invoke(getListenerTriggerCount)).isEqualTo(1);
+ }
+ }
+
+ @Test
+ public void normalClearFromDataStore() {
+ accessor.invoke(() -> feed(false));
+ verifyServerRegionSize(NUM_ENTRIES);
+
+ dataStore1.invoke(() -> getRegion(false).clear());
+
+ verifyServerRegionSize(0);
+ verifyCacheListenerTriggerCount(dataStore1);
+ }
+
+ @Test
+ public void normalClearFromAccessor() {
+ accessor.invoke(() -> feed(false));
+ verifyServerRegionSize(NUM_ENTRIES);
+ accessor.invoke(() -> getRegion(false).clear());
+ verifyServerRegionSize(0);
+ verifyCacheListenerTriggerCount(accessor);
+ }
+
+ @Test
+ public void normalClearFromClient() {
+ client1.invoke(this::initClientCache);
+ client2.invoke(this::initClientCache);
+
+ client1.invoke(() -> feed(true));
+ verifyClientRegionSize(NUM_ENTRIES);
+ verifyServerRegionSize(NUM_ENTRIES);
+
+ client1.invoke(() -> getRegion(true).clear());
+
+ verifyServerRegionSize(0);
+ verifyClientRegionSize(0);
+ verifyCacheListenerTriggerCount(null);
+ }
+
+ @Test
+ public void clearFromClientWithAccessorAsServer() {
+ dataStore1.invoke(this::stopServers);
+ dataStore2.invoke(this::stopServers);
+ dataStore3.invoke(this::stopServers);
+
+ client1.invoke(this::initClientCache);
+ client2.invoke(this::initClientCache);
+
+ client1.invoke(() -> feed(true));
+ verifyClientRegionSize(NUM_ENTRIES);
+ verifyServerRegionSize(NUM_ENTRIES);
+
+ client1.invoke(() -> getRegion(true).clear());
+
+ verifyServerRegionSize(0);
+ verifyClientRegionSize(0);
+ verifyCacheListenerTriggerCount(null);
+ }
+
+ @Test
+ public void normalClearFromDataStoreWithClientInterest() {
+ client1.invoke(this::initClientCache);
+ client2.invoke(this::initClientCache);
+
+ accessor.invoke(() -> feed(false));
+ verifyServerRegionSize(NUM_ENTRIES);
+
+ dataStore1.invoke(() -> getRegion(false).clear());
+
+ verifyServerRegionSize(0);
+ verifyCacheListenerTriggerCount(dataStore1);
+ }
+
+ @Test(expected = AssertionError.class)
Review comment:
Can we use `assertThatThrownBy` instead?.
##########
File path: geode-core/src/main/java/org/apache/geode/internal/cache/ClearPartitionedRegion.java
##########
@@ -0,0 +1,379 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.geode.internal.cache;
+
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Iterator;
+
+import org.apache.logging.log4j.Logger;
+
+import org.apache.geode.CancelException;
+import org.apache.geode.cache.Operation;
+import org.apache.geode.cache.partition.PartitionRegionHelper;
+import org.apache.geode.distributed.internal.DistributionManager;
+import org.apache.geode.distributed.internal.MembershipListener;
+import org.apache.geode.distributed.internal.ReplyException;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.cache.versions.RegionVersionVector;
+import org.apache.geode.logging.internal.log4j.api.LogService;
+
+public class ClearPartitionedRegion {
+
+ private static final Logger logger = LogService.getLogger();
+
+ private final PartitionedRegion partitionedRegion;
+
+ private LockForListenerAndClientNotification lockForListenerAndClientNotification =
+ new LockForListenerAndClientNotification();
+
+ private volatile boolean membershipchange = false;
+
+ public ClearPartitionedRegion(PartitionedRegion partitionedRegion) {
+ this.partitionedRegion = partitionedRegion;
+ partitionedRegion.getDistributionManager()
+ .addMembershipListener(new ClearPartitionedRegionListener());
+ }
+
+ public boolean isLockedForListenerAndClientNotification() {
+ return lockForListenerAndClientNotification.isLocked();
+ }
+
+ void acquireDistributedClearLock(String clearLock) {
+ try {
+ partitionedRegion.getPartitionedRegionLockService().lock(clearLock, -1, -1);
+ } catch (IllegalStateException e) {
+ partitionedRegion.lockCheckReadiness();
+ throw e;
+ }
+ }
+
+ void releaseDistributedClearLock(String clearLock) {
+ try {
+ partitionedRegion.getPartitionedRegionLockService().unlock(clearLock);
+ } catch (IllegalStateException e) {
+ partitionedRegion.lockCheckReadiness();
+ } catch (Exception ex) {
+ logger.warn("Caught exception while unlocking clear distributed lock", ex.getMessage());
+ }
+ }
+
+ void obtainLockForClear(RegionEventImpl event) {
+ sendClearRegionMessage(event,
+ ClearPartitionedRegionMessage.OperationType.OP_LOCK_FOR_PR_CLEAR);
+ obtainClearLockLocal(partitionedRegion.getDistributionManager().getId());
+ }
+
+ void releaseLockForClear(RegionEventImpl event) {
+ sendClearRegionMessage(event,
+ ClearPartitionedRegionMessage.OperationType.OP_UNLOCK_FOR_PR_CLEAR);
+ releaseClearLockLocal();
+ }
+
+ void clearRegion(RegionEventImpl regionEvent, boolean cacheWrite,
+ RegionVersionVector vector) {
+ clearRegionLocal(regionEvent, cacheWrite, null);
+ sendClearRegionMessage(regionEvent,
+ ClearPartitionedRegionMessage.OperationType.OP_PR_CLEAR);
+ }
+
+ private void waitForPrimary() {
+ boolean retry;
+ int retryTime = 2 * 60 * 1000 /* partitionedRegion.getRetryTimeout() */;
+ PartitionedRegion.RetryTimeKeeper retryTimer = new PartitionedRegion.RetryTimeKeeper(retryTime);
+ do {
+ retry = false;
+ for (BucketRegion bucketRegion : partitionedRegion.getDataStore()
+ .getAllLocalBucketRegions()) {
+ if (!bucketRegion.getBucketAdvisor().hasPrimary()) {
+ if (retryTimer.overMaximum()) {
+ PRHARedundancyProvider.timedOut(partitionedRegion, null, null,
+ "do clear. Missing primary bucket",
+ retryTime);
+ }
+ retryTimer.waitForBucketsRecovery();
+ retry = true;
+ }
+ }
+ } while (retry);
+ }
+
+ public void clearRegionLocal(RegionEventImpl regionEvent, boolean cacheWrite,
+ RegionVersionVector vector) {
+ // Synchronized to handle the requester departure.
+ synchronized (lockForListenerAndClientNotification) {
+ if (partitionedRegion.getDataStore() != null) {
+ partitionedRegion.getDataStore().lockBucketCreationForRegionClear();
+ try {
+ boolean retry;
+ do {
+ retry = false;
+ for (BucketRegion localPrimaryBucketRegion : partitionedRegion.getDataStore()
+ .getAllLocalPrimaryBucketRegions()) {
+ if (localPrimaryBucketRegion.size() > 0) {
+ localPrimaryBucketRegion.clear();
+ }
+ }
+ if (membershipchange) {
+ membershipchange = false;
+ retry = true;
+ waitForPrimary();
+ }
+ } while (retry);
+
+ doAfterClear(regionEvent);
+ } finally {
+ partitionedRegion.getDataStore().unLockBucketCreationForRegionClear();
+ }
+ } else {
+ // Non data-store with client queue and listener
+ doAfterClear(regionEvent);
+ }
+ }
+ }
+
+ private void doAfterClear(RegionEventImpl regionEvent) {
+ if (partitionedRegion.hasAnyClientsInterested()) {
+ notifyClients(regionEvent);
+ }
+
+ if (partitionedRegion.hasListener()) {
+ partitionedRegion.dispatchListenerEvent(EnumListenerEvent.AFTER_REGION_CLEAR, regionEvent);
+ }
+ }
+
+ void notifyClients(RegionEventImpl event) {
+ // Set client routing information into the event
+ // The clear operation in case of PR is distributed differently
+ // hence the FilterRoutingInfo is set here instead of
+ // DistributedCacheOperation.distribute().
+ event.setEventType(EnumListenerEvent.AFTER_REGION_CLEAR);
+ if (!partitionedRegion.isUsedForMetaRegion() && !partitionedRegion
+ .isUsedForPartitionedRegionAdmin()
+ && !partitionedRegion.isUsedForPartitionedRegionBucket() && !partitionedRegion
+ .isUsedForParallelGatewaySenderQueue()) {
+
+ FilterRoutingInfo localCqFrInfo =
+ partitionedRegion.getFilterProfile().getFilterRoutingInfoPart1(event,
+ FilterProfile.NO_PROFILES, Collections.emptySet());
+
+ FilterRoutingInfo localCqInterestFrInfo =
+ partitionedRegion.getFilterProfile().getFilterRoutingInfoPart2(localCqFrInfo, event);
+
+ if (localCqInterestFrInfo != null) {
+ event.setLocalFilterInfo(localCqInterestFrInfo.getLocalFilterInfo());
+ }
+ }
+ partitionedRegion.notifyBridgeClients(event);
+ }
+
+ protected void obtainClearLockLocal(InternalDistributedMember requester) {
+ synchronized (lockForListenerAndClientNotification) {
+ // Check if the member is still part of the distributed system
+ if (!partitionedRegion.getDistributionManager().isCurrentMember(requester)) {
+ return;
+ }
+
+ lockForListenerAndClientNotification.setLocked(requester);
+ if (partitionedRegion.getDataStore() != null) {
+ for (BucketRegion localPrimaryBucketRegion : partitionedRegion.getDataStore()
+ .getAllLocalPrimaryBucketRegions()) {
+ try {
+ localPrimaryBucketRegion.lockLocallyForClear(partitionedRegion.getDistributionManager(),
+ partitionedRegion.getMyId(), null);
+ } catch (Exception ex) {
+ partitionedRegion.checkClosed();
+ }
+ }
+ }
+ }
+ }
+
+ protected void releaseClearLockLocal() {
+ synchronized (lockForListenerAndClientNotification) {
+ if (lockForListenerAndClientNotification.getLockRequester() == null) {
+ // The member has been left.
+ return;
+ }
+ try {
+ if (partitionedRegion.getDataStore() != null) {
+
+ for (BucketRegion localPrimaryBucketRegion : partitionedRegion.getDataStore()
+ .getAllLocalPrimaryBucketRegions()) {
+ try {
+ localPrimaryBucketRegion.releaseLockLocallyForClear(null);
+ } catch (Exception ex) {
+ logger.debug(
+ "Unable to acquire clear lock for bucket region " + localPrimaryBucketRegion
+ .getName(),
+ ex.getMessage());
+ partitionedRegion.checkClosed();
+ }
+ }
+ }
+ } finally {
+ lockForListenerAndClientNotification.setUnLocked();
+ }
+ }
+ }
+
+ private void sendClearRegionMessage(RegionEventImpl event,
+ ClearPartitionedRegionMessage.OperationType op) {
+ RegionEventImpl eventForLocalClear = (RegionEventImpl) event.clone();
+ eventForLocalClear.setOperation(Operation.REGION_LOCAL_CLEAR);
+
+ boolean retry = true;
+ while (retry) {
+ retry = attemptToSendClearRegionMessage(event, op);
+ }
+ }
+
+ private boolean attemptToSendClearRegionMessage(RegionEventImpl event,
+ ClearPartitionedRegionMessage.OperationType op) {
+ if (partitionedRegion.getPRRoot() == null) {
+ if (logger.isDebugEnabled()) {
+ logger.debug(
+ "Partition region {} failed to initialize. Remove its profile from remote members.",
+ this);
+ }
+ new UpdateAttributesProcessor(partitionedRegion, true).distribute(false);
+ return false;
+ }
+ final HashSet configRecipients =
+ new HashSet(partitionedRegion.getRegionAdvisor().adviseAllPRNodes());
+
+ // It's possible this instance has not been initialized
+ // or hasn't gotten through initialize() far enough to have
+ // sent a CreateRegionProcessor message, bug 36048
+ try {
+ final PartitionRegionConfig prConfig =
+ partitionedRegion.getPRRoot().get(partitionedRegion.getRegionIdentifier());
+
+ if (prConfig != null) {
+ // Fix for bug#34621 by Tushar
+ Iterator itr = prConfig.getNodes().iterator();
+ while (itr.hasNext()) {
+ InternalDistributedMember idm = ((Node) itr.next()).getMemberId();
+ if (!idm.equals(partitionedRegion.getMyId())) {
+ configRecipients.add(idm);
+ }
+ }
+ }
+ } catch (CancelException ignore) {
+ // ignore
+ }
+
+ try {
+ ClearPartitionedRegionMessage.ClearPartitionedRegionResponse resp =
+ new ClearPartitionedRegionMessage.ClearPartitionedRegionResponse(
+ partitionedRegion.getSystem(),
+ configRecipients);
+ ClearPartitionedRegionMessage clearPartitionedRegionMessage =
+ new ClearPartitionedRegionMessage(configRecipients, partitionedRegion, resp, op, event);
+ clearPartitionedRegionMessage.send();
+
+ resp.waitForRepliesUninterruptibly();
+
+ } catch (ReplyException e) {
+ if (e.getRootCause() instanceof ForceReattemptException) {
+ return true;
+ }
+ logger.warn(
+ "PartitionedRegion#sendClearRegionMessage: Caught exception during ClearRegionMessage send and waiting for response",
+ e);
+ }
+ return false;
+ }
+
+ void doClear(RegionEventImpl regionEvent, boolean cacheWrite,
+ PartitionedRegion partitionedRegion) {
+ String lockName = "_clearOperation" + partitionedRegion.getDisplayName();
+
+ try {
+ // distributed lock to make sure only one clear op is in progress in the cluster.
+ acquireDistributedClearLock(lockName);
+
+ // Force all primary buckets to be created before clear.
+ PartitionRegionHelper.assignBucketsToPartitions(partitionedRegion);
+
+ // do cacheWrite
+ partitionedRegion.cacheWriteBeforeRegionClear(regionEvent);
+
+ // Check if there are any listeners or clients interested. If so, then clear write
+ // locks needs to be taken on all local and remote primary buckets in order to
+ // preserve the ordering of client events (for concurrent operations on the region).
+ boolean acquireClearLockForClientNotification =
+ (partitionedRegion.hasAnyClientsInterested() && partitionedRegion.hasListener());
+ if (acquireClearLockForClientNotification) {
+ obtainLockForClear(regionEvent);
+ }
+ try {
+ clearRegion(regionEvent, cacheWrite, null);
+ } finally {
+ if (acquireClearLockForClientNotification) {
+ releaseLockForClear(regionEvent);
+ }
+ }
+
+ } finally {
+ releaseDistributedClearLock(lockName);
+ }
+ }
+
+ void handleClearFromDepartedMember(InternalDistributedMember departedMember) {
+ if (departedMember.equals(lockForListenerAndClientNotification.getLockRequester())) {
+ synchronized (lockForListenerAndClientNotification) {
+ if (lockForListenerAndClientNotification.getLockRequester() != null) {
+ releaseClearLockLocal();
+ }
+ }
+ }
+ }
+
+ class LockForListenerAndClientNotification {
+
+ private volatile boolean locked = false;
+
+ private volatile InternalDistributedMember lockRequester;
Review comment:
I think we don't need to `volatile` keyword here, as the fields are `private` and all methods (both accessors and setters) are `synchronised` already.
##########
File path: geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionAfterClearNotificationDUnitTest.java
##########
@@ -0,0 +1,388 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.geode.internal.cache;
+
+import static java.util.concurrent.TimeUnit.SECONDS;
+import static org.apache.geode.internal.Assert.fail;
+import static org.apache.geode.test.dunit.rules.ClusterStartupRule.getCache;
+import static org.apache.geode.test.dunit.rules.ClusterStartupRule.getClientCache;
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.Properties;
+import java.util.concurrent.TimeoutException;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.stream.IntStream;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+
+import org.apache.geode.cache.InterestResultPolicy;
+import org.apache.geode.cache.PartitionAttributesFactory;
+import org.apache.geode.cache.Region;
+import org.apache.geode.cache.RegionEvent;
+import org.apache.geode.cache.RegionShortcut;
+import org.apache.geode.cache.client.ClientRegionShortcut;
+import org.apache.geode.cache.server.CacheServer;
+import org.apache.geode.cache.util.CacheListenerAdapter;
+import org.apache.geode.distributed.internal.ClusterDistributionManager;
+import org.apache.geode.distributed.internal.DistributionMessage;
+import org.apache.geode.distributed.internal.DistributionMessageObserver;
+import org.apache.geode.test.awaitility.GeodeAwaitility;
+import org.apache.geode.test.dunit.AsyncInvocation;
+import org.apache.geode.test.dunit.DUnitBlackboard;
+import org.apache.geode.test.dunit.SerializableCallableIF;
+import org.apache.geode.test.dunit.rules.ClientVM;
+import org.apache.geode.test.dunit.rules.ClusterStartupRule;
+import org.apache.geode.test.dunit.rules.MemberVM;
+
+public class PartitionedRegionAfterClearNotificationDUnitTest implements Serializable {
+ protected static final String REGION_NAME = "testPR";
+ protected static final int NUM_ENTRIES = 100;
+
+ protected int locatorPort;
+ protected MemberVM locator;
+ protected MemberVM dataStore1, dataStore2, dataStore3, accessor;
+ protected ClientVM client1, client2;
+
+ private static final Logger logger = LogManager.getLogger();
+
+ private static volatile DUnitBlackboard blackboard;
+
+ @Rule
+ public ClusterStartupRule cluster = new ClusterStartupRule(7);
+
+ @Before
+ public void setUp() throws Exception {
+ locator = cluster.startLocatorVM(0);
+ locatorPort = locator.getPort();
+ dataStore1 = cluster.startServerVM(1, getProperties(), locatorPort);
+ dataStore2 = cluster.startServerVM(2, getProperties(), locatorPort);
+ dataStore3 = cluster.startServerVM(3, getProperties(), locatorPort);
+ accessor = cluster.startServerVM(4, getProperties(), locatorPort);
+
+ client1 = cluster.startClientVM(5,
+ c -> c.withPoolSubscription(true).withLocatorConnection((locatorPort)));
+ client2 = cluster.startClientVM(6,
+ c -> c.withPoolSubscription(true).withLocatorConnection((locatorPort)));
+
+ dataStore1.invoke(this::initDataStore);
+ dataStore2.invoke(this::initDataStore);
+ dataStore3.invoke(this::initDataStore);
+ accessor.invoke(this::initAccessor);
+
+ getBlackboard().initBlackboard();
+ }
+
+ protected RegionShortcut getRegionShortCut() {
+ return RegionShortcut.PARTITION_REDUNDANT;
+ }
+
+ protected Properties getProperties() {
+ Properties properties = new Properties();
+ // properties.setProperty("log-level", "info");
+ return properties;
+ }
+
+ private Region getRegion(boolean isClient) {
+ if (isClient) {
+ return getClientCache().getRegion(REGION_NAME);
+ } else {
+ return getCache().getRegion(REGION_NAME);
+ }
+ }
+
+ private void verifyRegionSize(boolean isClient, int expectedNum) {
+ GeodeAwaitility.await().atMost(10, SECONDS)
+ .untilAsserted(() -> assertThat(getRegion(isClient).size()).isEqualTo(expectedNum));
+ }
+
+ private void initClientCache() {
+ Region region = getClientCache().createClientRegionFactory(ClientRegionShortcut.CACHING_PROXY)
+ .create(REGION_NAME);
+ region.registerInterestForAllKeys(InterestResultPolicy.KEYS);
+ }
+
+ private void stopServers() {
+ List<CacheServer> cacheServers = getCache().getCacheServers();
+ for (CacheServer server : cacheServers) {
+ server.stop();
+ }
+ }
+
+ private void initDataStore() {
+ getCache().createRegionFactory(getRegionShortCut())
+ .setPartitionAttributes(new PartitionAttributesFactory().setTotalNumBuckets(10).create())
+ .addCacheListener(new CountingCacheListener())
+ .create(REGION_NAME);
+ }
+
+ private void initAccessor() {
+ RegionShortcut shortcut = getRegionShortCut();
+ if (shortcut.isPersistent()) {
+ if (shortcut == RegionShortcut.PARTITION_PERSISTENT) {
+ shortcut = RegionShortcut.PARTITION;
+ } else if (shortcut == RegionShortcut.PARTITION_PERSISTENT_OVERFLOW) {
+ shortcut = RegionShortcut.PARTITION_OVERFLOW;
+ } else if (shortcut == RegionShortcut.PARTITION_REDUNDANT_PERSISTENT) {
+ shortcut = RegionShortcut.PARTITION_REDUNDANT;
+ } else if (shortcut == RegionShortcut.PARTITION_REDUNDANT_PERSISTENT_OVERFLOW) {
+ shortcut = RegionShortcut.PARTITION_REDUNDANT_OVERFLOW;
+ } else {
+ fail("Wrong region type:" + shortcut);
+ }
+ }
+ getCache().createRegionFactory(shortcut)
+ .setPartitionAttributes(
+ new PartitionAttributesFactory().setTotalNumBuckets(10).setLocalMaxMemory(0).create())
+ .addCacheListener(new CountingCacheListener())
+ .create(REGION_NAME);
+ }
+
+ private void feed(boolean isClient) {
+ Region region = getRegion(isClient);
+ IntStream.range(0, NUM_ENTRIES).forEach(i -> region.put(i, "value" + i));
+ }
+
+ private void verifyServerRegionSize(int expectedNum) {
+ accessor.invoke(() -> verifyRegionSize(false, expectedNum));
+ dataStore1.invoke(() -> verifyRegionSize(false, expectedNum));
+ dataStore2.invoke(() -> verifyRegionSize(false, expectedNum));
+ dataStore3.invoke(() -> verifyRegionSize(false, expectedNum));
+ }
+
+ private void verifyClientRegionSize(int expectedNum) {
+ client1.invoke(() -> verifyRegionSize(true, expectedNum));
+ client2.invoke(() -> verifyRegionSize(true, expectedNum));
+ }
+
+ private void verifyCacheListenerTriggerCount(MemberVM serverVM) {
+ SerializableCallableIF<Integer> getListenerTriggerCount = () -> {
+ CountingCacheListener countingCacheListener =
+ (CountingCacheListener) getRegion(false).getAttributes()
+ .getCacheListeners()[0];
+ return countingCacheListener.getClears();
+ };
+
+ int count = accessor.invoke(getListenerTriggerCount)
+ + dataStore1.invoke(getListenerTriggerCount)
+ + dataStore2.invoke(getListenerTriggerCount)
+ + dataStore3.invoke(getListenerTriggerCount);
+ assertThat(count).isEqualTo(4);
+
+ if (serverVM != null) {
+ assertThat(serverVM.invoke(getListenerTriggerCount)).isEqualTo(1);
+ }
+ }
+
+ @Test
+ public void normalClearFromDataStore() {
+ accessor.invoke(() -> feed(false));
+ verifyServerRegionSize(NUM_ENTRIES);
+
+ dataStore1.invoke(() -> getRegion(false).clear());
+
+ verifyServerRegionSize(0);
+ verifyCacheListenerTriggerCount(dataStore1);
+ }
+
+ @Test
+ public void normalClearFromAccessor() {
+ accessor.invoke(() -> feed(false));
+ verifyServerRegionSize(NUM_ENTRIES);
+ accessor.invoke(() -> getRegion(false).clear());
+ verifyServerRegionSize(0);
+ verifyCacheListenerTriggerCount(accessor);
+ }
+
+ @Test
+ public void normalClearFromClient() {
+ client1.invoke(this::initClientCache);
+ client2.invoke(this::initClientCache);
+
+ client1.invoke(() -> feed(true));
+ verifyClientRegionSize(NUM_ENTRIES);
+ verifyServerRegionSize(NUM_ENTRIES);
+
+ client1.invoke(() -> getRegion(true).clear());
+
+ verifyServerRegionSize(0);
+ verifyClientRegionSize(0);
+ verifyCacheListenerTriggerCount(null);
+ }
+
+ @Test
+ public void clearFromClientWithAccessorAsServer() {
+ dataStore1.invoke(this::stopServers);
+ dataStore2.invoke(this::stopServers);
+ dataStore3.invoke(this::stopServers);
+
+ client1.invoke(this::initClientCache);
+ client2.invoke(this::initClientCache);
+
+ client1.invoke(() -> feed(true));
+ verifyClientRegionSize(NUM_ENTRIES);
+ verifyServerRegionSize(NUM_ENTRIES);
+
+ client1.invoke(() -> getRegion(true).clear());
+
+ verifyServerRegionSize(0);
+ verifyClientRegionSize(0);
+ verifyCacheListenerTriggerCount(null);
+ }
+
+ @Test
+ public void normalClearFromDataStoreWithClientInterest() {
+ client1.invoke(this::initClientCache);
+ client2.invoke(this::initClientCache);
+
+ accessor.invoke(() -> feed(false));
+ verifyServerRegionSize(NUM_ENTRIES);
+
+ dataStore1.invoke(() -> getRegion(false).clear());
+
+ verifyServerRegionSize(0);
+ verifyCacheListenerTriggerCount(dataStore1);
+ }
+
+ @Test(expected = AssertionError.class)
+ public void verifyTheLocksAreClearedWhenMemberDepartsAfterTakingClearLockOnRemoteMembers()
+ throws Exception {
+ client1.invoke(this::initClientCache);
+ client2.invoke(this::initClientCache);
+
+ accessor.invoke(() -> feed(false));
+ verifyServerRegionSize(NUM_ENTRIES);
+ dataStore2.invoke(() -> DistributionMessageObserver.setInstance(
+ testHookToKillMemberCallingClearBeforeMessageProcessed()));
+
+ AsyncInvocation ds1ClearAsync = dataStore1.invokeAsync(() -> getRegion(false).clear());
+
+ getBlackboard().waitForGate("CacheClose", 30, SECONDS);
+
+ dataStore1.invoke(() -> getCache().close());
+ getBlackboard().signalGate("CacheClosed");
+
+ // This should not be blocked.
+ dataStore2.invoke(() -> feed(false));
+ dataStore3.invoke(() -> feed(false));
+
+ dataStore2.invoke(() -> verifyRegionSize(false, NUM_ENTRIES));
+ dataStore3.invoke(() -> verifyRegionSize(false, NUM_ENTRIES));
+
+ ds1ClearAsync.await();
+ }
+
+ @Test
+ public void verifyTheLocksAreClearedWhenMemberDepartsAfterTakingClearLockOnRemoteMembersAfterMessageProcessed()
+ throws Exception {
+ client1.invoke(this::initClientCache);
+ client2.invoke(this::initClientCache);
+
+ accessor.invoke(() -> feed(false));
+ verifyServerRegionSize(NUM_ENTRIES);
+
+ dataStore2.invoke(() -> DistributionMessageObserver.setInstance(
+ testHookToKillMemberCallingClearAfterMessageProcessed()));
+
+ AsyncInvocation ds1ClearAsync = dataStore1.invokeAsync(() -> getRegion(false).clear());
+
+ getBlackboard().waitForGate("CacheClose", 30, SECONDS);
+
+ dataStore1.invoke(() -> getCache().close());
+ getBlackboard().signalGate("CacheClosed");
+
+ // This should not be blocked.
+ dataStore2.invoke(() -> feed(false));
+ dataStore3.invoke(() -> feed(false));
+
+ dataStore2.invoke(() -> verifyRegionSize(false, NUM_ENTRIES));
+ dataStore3.invoke(() -> verifyRegionSize(false, NUM_ENTRIES));
+
+ ds1ClearAsync.await();
+ }
+
+
+ private static class CountingCacheListener extends CacheListenerAdapter {
+ private final AtomicInteger clears = new AtomicInteger();
+
+ @Override
+ public void afterRegionClear(RegionEvent event) {
+ Region region = event.getRegion();
Review comment:
Unused variable.
##########
File path: geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionAfterClearNotificationDUnitTest.java
##########
@@ -0,0 +1,388 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.geode.internal.cache;
+
+import static java.util.concurrent.TimeUnit.SECONDS;
+import static org.apache.geode.internal.Assert.fail;
+import static org.apache.geode.test.dunit.rules.ClusterStartupRule.getCache;
+import static org.apache.geode.test.dunit.rules.ClusterStartupRule.getClientCache;
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.Properties;
+import java.util.concurrent.TimeoutException;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.stream.IntStream;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+
+import org.apache.geode.cache.InterestResultPolicy;
+import org.apache.geode.cache.PartitionAttributesFactory;
+import org.apache.geode.cache.Region;
+import org.apache.geode.cache.RegionEvent;
+import org.apache.geode.cache.RegionShortcut;
+import org.apache.geode.cache.client.ClientRegionShortcut;
+import org.apache.geode.cache.server.CacheServer;
+import org.apache.geode.cache.util.CacheListenerAdapter;
+import org.apache.geode.distributed.internal.ClusterDistributionManager;
+import org.apache.geode.distributed.internal.DistributionMessage;
+import org.apache.geode.distributed.internal.DistributionMessageObserver;
+import org.apache.geode.test.awaitility.GeodeAwaitility;
+import org.apache.geode.test.dunit.AsyncInvocation;
+import org.apache.geode.test.dunit.DUnitBlackboard;
+import org.apache.geode.test.dunit.SerializableCallableIF;
+import org.apache.geode.test.dunit.rules.ClientVM;
+import org.apache.geode.test.dunit.rules.ClusterStartupRule;
+import org.apache.geode.test.dunit.rules.MemberVM;
+
+public class PartitionedRegionAfterClearNotificationDUnitTest implements Serializable {
+ protected static final String REGION_NAME = "testPR";
+ protected static final int NUM_ENTRIES = 100;
+
+ protected int locatorPort;
+ protected MemberVM locator;
+ protected MemberVM dataStore1, dataStore2, dataStore3, accessor;
+ protected ClientVM client1, client2;
+
+ private static final Logger logger = LogManager.getLogger();
+
+ private static volatile DUnitBlackboard blackboard;
+
+ @Rule
+ public ClusterStartupRule cluster = new ClusterStartupRule(7);
+
+ @Before
+ public void setUp() throws Exception {
+ locator = cluster.startLocatorVM(0);
+ locatorPort = locator.getPort();
+ dataStore1 = cluster.startServerVM(1, getProperties(), locatorPort);
+ dataStore2 = cluster.startServerVM(2, getProperties(), locatorPort);
+ dataStore3 = cluster.startServerVM(3, getProperties(), locatorPort);
+ accessor = cluster.startServerVM(4, getProperties(), locatorPort);
+
+ client1 = cluster.startClientVM(5,
+ c -> c.withPoolSubscription(true).withLocatorConnection((locatorPort)));
+ client2 = cluster.startClientVM(6,
+ c -> c.withPoolSubscription(true).withLocatorConnection((locatorPort)));
+
+ dataStore1.invoke(this::initDataStore);
+ dataStore2.invoke(this::initDataStore);
+ dataStore3.invoke(this::initDataStore);
+ accessor.invoke(this::initAccessor);
+
+ getBlackboard().initBlackboard();
+ }
+
+ protected RegionShortcut getRegionShortCut() {
+ return RegionShortcut.PARTITION_REDUNDANT;
+ }
+
+ protected Properties getProperties() {
+ Properties properties = new Properties();
+ // properties.setProperty("log-level", "info");
+ return properties;
+ }
+
+ private Region getRegion(boolean isClient) {
+ if (isClient) {
+ return getClientCache().getRegion(REGION_NAME);
+ } else {
+ return getCache().getRegion(REGION_NAME);
+ }
+ }
+
+ private void verifyRegionSize(boolean isClient, int expectedNum) {
+ GeodeAwaitility.await().atMost(10, SECONDS)
+ .untilAsserted(() -> assertThat(getRegion(isClient).size()).isEqualTo(expectedNum));
+ }
+
+ private void initClientCache() {
+ Region region = getClientCache().createClientRegionFactory(ClientRegionShortcut.CACHING_PROXY)
+ .create(REGION_NAME);
+ region.registerInterestForAllKeys(InterestResultPolicy.KEYS);
+ }
+
+ private void stopServers() {
+ List<CacheServer> cacheServers = getCache().getCacheServers();
+ for (CacheServer server : cacheServers) {
+ server.stop();
+ }
+ }
+
+ private void initDataStore() {
+ getCache().createRegionFactory(getRegionShortCut())
+ .setPartitionAttributes(new PartitionAttributesFactory().setTotalNumBuckets(10).create())
+ .addCacheListener(new CountingCacheListener())
+ .create(REGION_NAME);
+ }
+
+ private void initAccessor() {
+ RegionShortcut shortcut = getRegionShortCut();
+ if (shortcut.isPersistent()) {
+ if (shortcut == RegionShortcut.PARTITION_PERSISTENT) {
+ shortcut = RegionShortcut.PARTITION;
+ } else if (shortcut == RegionShortcut.PARTITION_PERSISTENT_OVERFLOW) {
+ shortcut = RegionShortcut.PARTITION_OVERFLOW;
+ } else if (shortcut == RegionShortcut.PARTITION_REDUNDANT_PERSISTENT) {
+ shortcut = RegionShortcut.PARTITION_REDUNDANT;
+ } else if (shortcut == RegionShortcut.PARTITION_REDUNDANT_PERSISTENT_OVERFLOW) {
+ shortcut = RegionShortcut.PARTITION_REDUNDANT_OVERFLOW;
+ } else {
+ fail("Wrong region type:" + shortcut);
+ }
+ }
+ getCache().createRegionFactory(shortcut)
+ .setPartitionAttributes(
+ new PartitionAttributesFactory().setTotalNumBuckets(10).setLocalMaxMemory(0).create())
+ .addCacheListener(new CountingCacheListener())
+ .create(REGION_NAME);
+ }
+
+ private void feed(boolean isClient) {
+ Region region = getRegion(isClient);
+ IntStream.range(0, NUM_ENTRIES).forEach(i -> region.put(i, "value" + i));
+ }
+
+ private void verifyServerRegionSize(int expectedNum) {
+ accessor.invoke(() -> verifyRegionSize(false, expectedNum));
+ dataStore1.invoke(() -> verifyRegionSize(false, expectedNum));
+ dataStore2.invoke(() -> verifyRegionSize(false, expectedNum));
+ dataStore3.invoke(() -> verifyRegionSize(false, expectedNum));
+ }
+
+ private void verifyClientRegionSize(int expectedNum) {
+ client1.invoke(() -> verifyRegionSize(true, expectedNum));
+ client2.invoke(() -> verifyRegionSize(true, expectedNum));
+ }
+
+ private void verifyCacheListenerTriggerCount(MemberVM serverVM) {
+ SerializableCallableIF<Integer> getListenerTriggerCount = () -> {
+ CountingCacheListener countingCacheListener =
+ (CountingCacheListener) getRegion(false).getAttributes()
+ .getCacheListeners()[0];
+ return countingCacheListener.getClears();
+ };
+
+ int count = accessor.invoke(getListenerTriggerCount)
+ + dataStore1.invoke(getListenerTriggerCount)
+ + dataStore2.invoke(getListenerTriggerCount)
+ + dataStore3.invoke(getListenerTriggerCount);
+ assertThat(count).isEqualTo(4);
+
+ if (serverVM != null) {
+ assertThat(serverVM.invoke(getListenerTriggerCount)).isEqualTo(1);
+ }
+ }
+
+ @Test
+ public void normalClearFromDataStore() {
+ accessor.invoke(() -> feed(false));
+ verifyServerRegionSize(NUM_ENTRIES);
+
+ dataStore1.invoke(() -> getRegion(false).clear());
+
+ verifyServerRegionSize(0);
+ verifyCacheListenerTriggerCount(dataStore1);
+ }
+
+ @Test
+ public void normalClearFromAccessor() {
+ accessor.invoke(() -> feed(false));
+ verifyServerRegionSize(NUM_ENTRIES);
+ accessor.invoke(() -> getRegion(false).clear());
+ verifyServerRegionSize(0);
+ verifyCacheListenerTriggerCount(accessor);
+ }
+
+ @Test
+ public void normalClearFromClient() {
+ client1.invoke(this::initClientCache);
+ client2.invoke(this::initClientCache);
+
+ client1.invoke(() -> feed(true));
+ verifyClientRegionSize(NUM_ENTRIES);
+ verifyServerRegionSize(NUM_ENTRIES);
+
+ client1.invoke(() -> getRegion(true).clear());
+
+ verifyServerRegionSize(0);
+ verifyClientRegionSize(0);
+ verifyCacheListenerTriggerCount(null);
+ }
+
+ @Test
+ public void clearFromClientWithAccessorAsServer() {
+ dataStore1.invoke(this::stopServers);
+ dataStore2.invoke(this::stopServers);
+ dataStore3.invoke(this::stopServers);
+
+ client1.invoke(this::initClientCache);
+ client2.invoke(this::initClientCache);
+
+ client1.invoke(() -> feed(true));
+ verifyClientRegionSize(NUM_ENTRIES);
+ verifyServerRegionSize(NUM_ENTRIES);
+
+ client1.invoke(() -> getRegion(true).clear());
+
+ verifyServerRegionSize(0);
+ verifyClientRegionSize(0);
+ verifyCacheListenerTriggerCount(null);
+ }
+
+ @Test
+ public void normalClearFromDataStoreWithClientInterest() {
+ client1.invoke(this::initClientCache);
+ client2.invoke(this::initClientCache);
+
+ accessor.invoke(() -> feed(false));
+ verifyServerRegionSize(NUM_ENTRIES);
+
+ dataStore1.invoke(() -> getRegion(false).clear());
+
+ verifyServerRegionSize(0);
+ verifyCacheListenerTriggerCount(dataStore1);
+ }
+
+ @Test(expected = AssertionError.class)
+ public void verifyTheLocksAreClearedWhenMemberDepartsAfterTakingClearLockOnRemoteMembers()
+ throws Exception {
+ client1.invoke(this::initClientCache);
+ client2.invoke(this::initClientCache);
+
+ accessor.invoke(() -> feed(false));
+ verifyServerRegionSize(NUM_ENTRIES);
+ dataStore2.invoke(() -> DistributionMessageObserver.setInstance(
+ testHookToKillMemberCallingClearBeforeMessageProcessed()));
+
+ AsyncInvocation ds1ClearAsync = dataStore1.invokeAsync(() -> getRegion(false).clear());
+
+ getBlackboard().waitForGate("CacheClose", 30, SECONDS);
Review comment:
+1
##########
File path: geode-core/src/main/java/org/apache/geode/internal/cache/ClearPartitionedRegion.java
##########
@@ -0,0 +1,379 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.geode.internal.cache;
+
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Iterator;
+
+import org.apache.logging.log4j.Logger;
+
+import org.apache.geode.CancelException;
+import org.apache.geode.cache.Operation;
+import org.apache.geode.cache.partition.PartitionRegionHelper;
+import org.apache.geode.distributed.internal.DistributionManager;
+import org.apache.geode.distributed.internal.MembershipListener;
+import org.apache.geode.distributed.internal.ReplyException;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.cache.versions.RegionVersionVector;
+import org.apache.geode.logging.internal.log4j.api.LogService;
+
+public class ClearPartitionedRegion {
Review comment:
Can we change the name to something more "meaningful"?, maybe `PartitionedRegionClearer` or something that lets the reader know that the class holds the actual implementation for clearing a `Partitioned Region`?.
##########
File path: geode-core/src/main/java/org/apache/geode/internal/cache/ClearPartitionedRegion.java
##########
@@ -0,0 +1,379 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.geode.internal.cache;
+
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Iterator;
+
+import org.apache.logging.log4j.Logger;
+
+import org.apache.geode.CancelException;
+import org.apache.geode.cache.Operation;
+import org.apache.geode.cache.partition.PartitionRegionHelper;
+import org.apache.geode.distributed.internal.DistributionManager;
+import org.apache.geode.distributed.internal.MembershipListener;
+import org.apache.geode.distributed.internal.ReplyException;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.cache.versions.RegionVersionVector;
+import org.apache.geode.logging.internal.log4j.api.LogService;
+
+public class ClearPartitionedRegion {
+
+ private static final Logger logger = LogService.getLogger();
+
+ private final PartitionedRegion partitionedRegion;
+
+ private LockForListenerAndClientNotification lockForListenerAndClientNotification =
+ new LockForListenerAndClientNotification();
+
+ private volatile boolean membershipchange = false;
Review comment:
+1
##########
File path: geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegionDataStore.java
##########
@@ -980,6 +980,14 @@ protected void lockBucketCreationAndVisit(BucketVisitor visitor) {
}
}
+ protected void lockBucketCreationForRegionClear() {
+ bucketCreationLock.writeLock().lock();
+ }
+
+ protected void unLockBucketCreationForRegionClear() {
Review comment:
Should probably be `unlockBucketCreationForRegionClear`.
##########
File path: geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/RegionAdvisor.java
##########
@@ -834,7 +834,7 @@ public InternalDistributedMember adviseFixedPrimaryPartitionDataStore(final int
});
}
- Set adviseAllServersWithInterest() {
+ public Set adviseAllServersWithInterest() {
Review comment:
No need to make it `public`, it's only invoked from `PRTombstoneMessage`, which belongs to the same package.
##########
File path: geode-core/src/main/java/org/apache/geode/internal/cache/ClearPartitionedRegion.java
##########
@@ -0,0 +1,379 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.geode.internal.cache;
+
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Iterator;
+
+import org.apache.logging.log4j.Logger;
+
+import org.apache.geode.CancelException;
+import org.apache.geode.cache.Operation;
+import org.apache.geode.cache.partition.PartitionRegionHelper;
+import org.apache.geode.distributed.internal.DistributionManager;
+import org.apache.geode.distributed.internal.MembershipListener;
+import org.apache.geode.distributed.internal.ReplyException;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.cache.versions.RegionVersionVector;
+import org.apache.geode.logging.internal.log4j.api.LogService;
+
+public class ClearPartitionedRegion {
+
+ private static final Logger logger = LogService.getLogger();
+
+ private final PartitionedRegion partitionedRegion;
+
+ private LockForListenerAndClientNotification lockForListenerAndClientNotification =
+ new LockForListenerAndClientNotification();
+
+ private volatile boolean membershipchange = false;
+
+ public ClearPartitionedRegion(PartitionedRegion partitionedRegion) {
+ this.partitionedRegion = partitionedRegion;
+ partitionedRegion.getDistributionManager()
+ .addMembershipListener(new ClearPartitionedRegionListener());
+ }
+
+ public boolean isLockedForListenerAndClientNotification() {
+ return lockForListenerAndClientNotification.isLocked();
+ }
+
+ void acquireDistributedClearLock(String clearLock) {
+ try {
+ partitionedRegion.getPartitionedRegionLockService().lock(clearLock, -1, -1);
+ } catch (IllegalStateException e) {
+ partitionedRegion.lockCheckReadiness();
+ throw e;
+ }
+ }
+
+ void releaseDistributedClearLock(String clearLock) {
+ try {
+ partitionedRegion.getPartitionedRegionLockService().unlock(clearLock);
+ } catch (IllegalStateException e) {
+ partitionedRegion.lockCheckReadiness();
+ } catch (Exception ex) {
+ logger.warn("Caught exception while unlocking clear distributed lock", ex.getMessage());
+ }
+ }
+
+ void obtainLockForClear(RegionEventImpl event) {
+ sendClearRegionMessage(event,
+ ClearPartitionedRegionMessage.OperationType.OP_LOCK_FOR_PR_CLEAR);
+ obtainClearLockLocal(partitionedRegion.getDistributionManager().getId());
+ }
+
+ void releaseLockForClear(RegionEventImpl event) {
+ sendClearRegionMessage(event,
+ ClearPartitionedRegionMessage.OperationType.OP_UNLOCK_FOR_PR_CLEAR);
+ releaseClearLockLocal();
+ }
+
+ void clearRegion(RegionEventImpl regionEvent, boolean cacheWrite,
+ RegionVersionVector vector) {
+ clearRegionLocal(regionEvent, cacheWrite, null);
+ sendClearRegionMessage(regionEvent,
+ ClearPartitionedRegionMessage.OperationType.OP_PR_CLEAR);
+ }
+
+ private void waitForPrimary() {
+ boolean retry;
+ int retryTime = 2 * 60 * 1000 /* partitionedRegion.getRetryTimeout() */;
+ PartitionedRegion.RetryTimeKeeper retryTimer = new PartitionedRegion.RetryTimeKeeper(retryTime);
+ do {
+ retry = false;
+ for (BucketRegion bucketRegion : partitionedRegion.getDataStore()
+ .getAllLocalBucketRegions()) {
+ if (!bucketRegion.getBucketAdvisor().hasPrimary()) {
+ if (retryTimer.overMaximum()) {
+ PRHARedundancyProvider.timedOut(partitionedRegion, null, null,
+ "do clear. Missing primary bucket",
+ retryTime);
+ }
+ retryTimer.waitForBucketsRecovery();
+ retry = true;
+ }
+ }
+ } while (retry);
+ }
+
+ public void clearRegionLocal(RegionEventImpl regionEvent, boolean cacheWrite,
+ RegionVersionVector vector) {
Review comment:
+1
##########
File path: geode-core/src/main/java/org/apache/geode/internal/cache/ClearPartitionedRegion.java
##########
@@ -0,0 +1,379 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.geode.internal.cache;
+
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Iterator;
+
+import org.apache.logging.log4j.Logger;
+
+import org.apache.geode.CancelException;
+import org.apache.geode.cache.Operation;
+import org.apache.geode.cache.partition.PartitionRegionHelper;
+import org.apache.geode.distributed.internal.DistributionManager;
+import org.apache.geode.distributed.internal.MembershipListener;
+import org.apache.geode.distributed.internal.ReplyException;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.cache.versions.RegionVersionVector;
+import org.apache.geode.logging.internal.log4j.api.LogService;
+
+public class ClearPartitionedRegion {
+
+ private static final Logger logger = LogService.getLogger();
+
+ private final PartitionedRegion partitionedRegion;
+
+ private LockForListenerAndClientNotification lockForListenerAndClientNotification =
+ new LockForListenerAndClientNotification();
+
+ private volatile boolean membershipchange = false;
+
+ public ClearPartitionedRegion(PartitionedRegion partitionedRegion) {
+ this.partitionedRegion = partitionedRegion;
+ partitionedRegion.getDistributionManager()
+ .addMembershipListener(new ClearPartitionedRegionListener());
+ }
+
+ public boolean isLockedForListenerAndClientNotification() {
+ return lockForListenerAndClientNotification.isLocked();
+ }
+
+ void acquireDistributedClearLock(String clearLock) {
+ try {
+ partitionedRegion.getPartitionedRegionLockService().lock(clearLock, -1, -1);
+ } catch (IllegalStateException e) {
+ partitionedRegion.lockCheckReadiness();
+ throw e;
+ }
+ }
+
+ void releaseDistributedClearLock(String clearLock) {
+ try {
+ partitionedRegion.getPartitionedRegionLockService().unlock(clearLock);
+ } catch (IllegalStateException e) {
+ partitionedRegion.lockCheckReadiness();
+ } catch (Exception ex) {
+ logger.warn("Caught exception while unlocking clear distributed lock", ex.getMessage());
Review comment:
I think you're missing a `{}` within the log message, otherwise the `ex.getMessage()` won't be shown.
##########
File path: geode-core/src/main/java/org/apache/geode/internal/cache/ClearPartitionedRegion.java
##########
@@ -0,0 +1,379 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.geode.internal.cache;
+
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Iterator;
+
+import org.apache.logging.log4j.Logger;
+
+import org.apache.geode.CancelException;
+import org.apache.geode.cache.Operation;
+import org.apache.geode.cache.partition.PartitionRegionHelper;
+import org.apache.geode.distributed.internal.DistributionManager;
+import org.apache.geode.distributed.internal.MembershipListener;
+import org.apache.geode.distributed.internal.ReplyException;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.cache.versions.RegionVersionVector;
+import org.apache.geode.logging.internal.log4j.api.LogService;
+
+public class ClearPartitionedRegion {
+
+ private static final Logger logger = LogService.getLogger();
+
+ private final PartitionedRegion partitionedRegion;
+
+ private LockForListenerAndClientNotification lockForListenerAndClientNotification =
+ new LockForListenerAndClientNotification();
+
+ private volatile boolean membershipchange = false;
+
+ public ClearPartitionedRegion(PartitionedRegion partitionedRegion) {
+ this.partitionedRegion = partitionedRegion;
+ partitionedRegion.getDistributionManager()
+ .addMembershipListener(new ClearPartitionedRegionListener());
+ }
+
+ public boolean isLockedForListenerAndClientNotification() {
+ return lockForListenerAndClientNotification.isLocked();
+ }
+
+ void acquireDistributedClearLock(String clearLock) {
+ try {
+ partitionedRegion.getPartitionedRegionLockService().lock(clearLock, -1, -1);
+ } catch (IllegalStateException e) {
+ partitionedRegion.lockCheckReadiness();
+ throw e;
+ }
+ }
+
+ void releaseDistributedClearLock(String clearLock) {
+ try {
+ partitionedRegion.getPartitionedRegionLockService().unlock(clearLock);
+ } catch (IllegalStateException e) {
+ partitionedRegion.lockCheckReadiness();
+ } catch (Exception ex) {
+ logger.warn("Caught exception while unlocking clear distributed lock", ex.getMessage());
+ }
+ }
+
+ void obtainLockForClear(RegionEventImpl event) {
+ sendClearRegionMessage(event,
+ ClearPartitionedRegionMessage.OperationType.OP_LOCK_FOR_PR_CLEAR);
+ obtainClearLockLocal(partitionedRegion.getDistributionManager().getId());
+ }
+
+ void releaseLockForClear(RegionEventImpl event) {
+ sendClearRegionMessage(event,
+ ClearPartitionedRegionMessage.OperationType.OP_UNLOCK_FOR_PR_CLEAR);
+ releaseClearLockLocal();
+ }
+
+ void clearRegion(RegionEventImpl regionEvent, boolean cacheWrite,
+ RegionVersionVector vector) {
+ clearRegionLocal(regionEvent, cacheWrite, null);
+ sendClearRegionMessage(regionEvent,
+ ClearPartitionedRegionMessage.OperationType.OP_PR_CLEAR);
+ }
+
+ private void waitForPrimary() {
+ boolean retry;
+ int retryTime = 2 * 60 * 1000 /* partitionedRegion.getRetryTimeout() */;
+ PartitionedRegion.RetryTimeKeeper retryTimer = new PartitionedRegion.RetryTimeKeeper(retryTime);
+ do {
+ retry = false;
+ for (BucketRegion bucketRegion : partitionedRegion.getDataStore()
+ .getAllLocalBucketRegions()) {
+ if (!bucketRegion.getBucketAdvisor().hasPrimary()) {
+ if (retryTimer.overMaximum()) {
+ PRHARedundancyProvider.timedOut(partitionedRegion, null, null,
+ "do clear. Missing primary bucket",
+ retryTime);
+ }
+ retryTimer.waitForBucketsRecovery();
+ retry = true;
+ }
+ }
+ } while (retry);
+ }
+
+ public void clearRegionLocal(RegionEventImpl regionEvent, boolean cacheWrite,
+ RegionVersionVector vector) {
+ // Synchronized to handle the requester departure.
+ synchronized (lockForListenerAndClientNotification) {
+ if (partitionedRegion.getDataStore() != null) {
+ partitionedRegion.getDataStore().lockBucketCreationForRegionClear();
+ try {
+ boolean retry;
+ do {
+ retry = false;
+ for (BucketRegion localPrimaryBucketRegion : partitionedRegion.getDataStore()
+ .getAllLocalPrimaryBucketRegions()) {
+ if (localPrimaryBucketRegion.size() > 0) {
+ localPrimaryBucketRegion.clear();
+ }
+ }
+ if (membershipchange) {
+ membershipchange = false;
+ retry = true;
+ waitForPrimary();
+ }
+ } while (retry);
+
+ doAfterClear(regionEvent);
+ } finally {
+ partitionedRegion.getDataStore().unLockBucketCreationForRegionClear();
+ }
+ } else {
+ // Non data-store with client queue and listener
+ doAfterClear(regionEvent);
+ }
+ }
+ }
Review comment:
The method `doAfterClear(regionEvent)` is invoked no matter what (at leat when there's no exception thrown), so maybe moving it outside of the `if/else` block might make things more readable.
##########
File path: geode-core/src/main/java/org/apache/geode/internal/cache/ClearPartitionedRegion.java
##########
@@ -0,0 +1,379 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.geode.internal.cache;
+
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Iterator;
+
+import org.apache.logging.log4j.Logger;
+
+import org.apache.geode.CancelException;
+import org.apache.geode.cache.Operation;
+import org.apache.geode.cache.partition.PartitionRegionHelper;
+import org.apache.geode.distributed.internal.DistributionManager;
+import org.apache.geode.distributed.internal.MembershipListener;
+import org.apache.geode.distributed.internal.ReplyException;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.cache.versions.RegionVersionVector;
+import org.apache.geode.logging.internal.log4j.api.LogService;
+
+public class ClearPartitionedRegion {
+
+ private static final Logger logger = LogService.getLogger();
+
+ private final PartitionedRegion partitionedRegion;
+
+ private LockForListenerAndClientNotification lockForListenerAndClientNotification =
Review comment:
+1
##########
File path: geode-core/src/main/java/org/apache/geode/internal/cache/InternalRegion.java
##########
@@ -459,4 +459,7 @@ VersionedObjectList basicRemoveAll(Collection<Object> keys,
* @return true if synchronization should be attempted
*/
boolean shouldSyncForCrashedMember(InternalDistributedMember id);
+
+ void clearRegionLocal(RegionEventImpl regionEvent, boolean cacheWrite,
Review comment:
Maybe it's just me, but the old method name , `clearRegionLocally`, seems to be easier to understand for the reader?.
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [geode] agingade commented on a change in pull request #4987: GEODE-7678: Support for cache-listener and client-notification for Partitioned Region Clear operation.
Posted by GitBox <gi...@apache.org>.
agingade commented on a change in pull request #4987:
URL: https://github.com/apache/geode/pull/4987#discussion_r425408717
##########
File path: geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionPersistentClearDUnitTest.java
##########
@@ -0,0 +1,26 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.geode.internal.cache;
+
+
+
+import org.apache.geode.cache.RegionShortcut;
+
+public class PartitionedRegionPersistentClearDUnitTest extends PartitionedRegionClearDUnitTest {
+
+ protected RegionShortcut getRegionShortCut() {
+ return RegionShortcut.PARTITION_REDUNDANT_PERSISTENT;
Review comment:
If you are referring to PartitionedRegionPersistentClearDUnitTest, this PR did not add that test.
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [geode] jchen21 commented on a change in pull request #4987: GEODE-7678: Support for cache-listener and client-notification for Partitioned Region Clear operation.
Posted by GitBox <gi...@apache.org>.
jchen21 commented on a change in pull request #4987:
URL: https://github.com/apache/geode/pull/4987#discussion_r424774929
##########
File path: geode-core/src/distributedTest/java/org/apache/geode/cache/PRCacheListenerDistributedTest.java
##########
@@ -79,4 +118,206 @@ protected int expectedInvalidates() {
protected int expectedDestroys() {
return 1;
}
+
+ @Test
+ public void afterRegionDestroyIsInvokedInEveryMember() {
+ CacheListener<String, Integer> listener = new RegionDestroyCountingCacheListener();
+ Region<String, Integer> region = createRegion(regionName, listener);
+
+ for (int i = 0; i < getVMCount(); i++) {
+ getVM(i).invoke(() -> {
+ withData(createRegion(regionName, listener));
+ });
+ }
+
+ region.destroyRegion();
+
+ assertThat(sharedCountersRule.getTotal(REGION_DESTROY)).isEqualTo(expectedRegionDestroys());
+ }
+
+ @Test
+ public void afterRegionDestroyIsInvokedOnNodeWithListener() {
+ CacheListener<String, Integer> listener = new RegionDestroyCountingCacheListener();
+ Region<String, Integer> region = createRegion(regionName, listener);
+
+ for (int i = 0; i < getVMCount(); i++) {
+ getVM(i).invoke(() -> {
+ withData(createRegion(regionName, null));
+ });
+ }
+
+ region.destroyRegion();
+
+ assertThat(sharedCountersRule.getTotal(REGION_DESTROY)).isEqualTo(1);
+ }
+
+ @Test
+ public void afterRegionDestroyIsInvokedOnRemoteNodeWithListener() {
+ CacheListener<String, Integer> listener = new RegionDestroyCountingCacheListener();
+ Region<String, Integer> region = createRegion(regionName, null);
+
+ getVM(0).invoke(() -> {
+ createRegion(regionName, listener);
+ });
+
+ for (int i = 1; i < getVMCount(); i++) {
+ getVM(i).invoke(() -> {
+ withData(createRegion(regionName, null));
+ });
+ }
+
+ region.destroyRegion();
+
+ assertThat(sharedCountersRule.getTotal(REGION_DESTROY)).isEqualTo(1);
+ }
+
+ @Test
+ public void afterRegionDestroyIsInvokedOnAccessorAndDataMembers() {
+ CacheListener<String, Integer> listener = new RegionDestroyCountingCacheListener();
+ Region<String, Integer> region = createAccessorRegion(regionName, listener);
+ for (int i = 0; i < getVMCount(); i++) {
+ getVM(i).invoke(() -> {
+ withData(createRegion(regionName, listener));
+ });
+ }
+
+ region.destroyRegion();
+
+ assertThat(sharedCountersRule.getTotal(REGION_DESTROY)).isEqualTo(expectedRegionDestroys());
+ }
+
+ @Test
+ public void afterRegionDestroyIsInvokedOnAccessor() {
+ CacheListener<String, Integer> listener = new RegionDestroyCountingCacheListener();
+ Region<String, Integer> region = createAccessorRegion(regionName, listener);
+
+ for (int i = 0; i < getVMCount(); i++) {
+ getVM(i).invoke(() -> {
+ withData(createRegion(regionName, null));
+ });
+ }
+
+ region.destroyRegion();
+
+ assertThat(sharedCountersRule.getTotal(REGION_DESTROY)).isEqualTo(1);
+ }
+
+ @Test
+ public void afterRegionDestroyIsInvokedNonOnNonAccessor() {
Review comment:
Looks like there is a typo in the method name.
##########
File path: geode-core/src/distributedTest/java/org/apache/geode/cache/PRCacheListenerDistributedTest.java
##########
@@ -79,4 +118,206 @@ protected int expectedInvalidates() {
protected int expectedDestroys() {
return 1;
}
+
+ @Test
+ public void afterRegionDestroyIsInvokedInEveryMember() {
+ CacheListener<String, Integer> listener = new RegionDestroyCountingCacheListener();
+ Region<String, Integer> region = createRegion(regionName, listener);
+
+ for (int i = 0; i < getVMCount(); i++) {
+ getVM(i).invoke(() -> {
+ withData(createRegion(regionName, listener));
+ });
+ }
+
+ region.destroyRegion();
+
+ assertThat(sharedCountersRule.getTotal(REGION_DESTROY)).isEqualTo(expectedRegionDestroys());
+ }
+
+ @Test
+ public void afterRegionDestroyIsInvokedOnNodeWithListener() {
+ CacheListener<String, Integer> listener = new RegionDestroyCountingCacheListener();
+ Region<String, Integer> region = createRegion(regionName, listener);
+
+ for (int i = 0; i < getVMCount(); i++) {
+ getVM(i).invoke(() -> {
+ withData(createRegion(regionName, null));
+ });
+ }
+
+ region.destroyRegion();
+
+ assertThat(sharedCountersRule.getTotal(REGION_DESTROY)).isEqualTo(1);
+ }
+
+ @Test
+ public void afterRegionDestroyIsInvokedOnRemoteNodeWithListener() {
+ CacheListener<String, Integer> listener = new RegionDestroyCountingCacheListener();
+ Region<String, Integer> region = createRegion(regionName, null);
+
+ getVM(0).invoke(() -> {
+ createRegion(regionName, listener);
+ });
+
+ for (int i = 1; i < getVMCount(); i++) {
+ getVM(i).invoke(() -> {
+ withData(createRegion(regionName, null));
+ });
+ }
+
+ region.destroyRegion();
+
+ assertThat(sharedCountersRule.getTotal(REGION_DESTROY)).isEqualTo(1);
+ }
+
+ @Test
+ public void afterRegionDestroyIsInvokedOnAccessorAndDataMembers() {
+ CacheListener<String, Integer> listener = new RegionDestroyCountingCacheListener();
+ Region<String, Integer> region = createAccessorRegion(regionName, listener);
+ for (int i = 0; i < getVMCount(); i++) {
+ getVM(i).invoke(() -> {
+ withData(createRegion(regionName, listener));
+ });
+ }
+
+ region.destroyRegion();
+
+ assertThat(sharedCountersRule.getTotal(REGION_DESTROY)).isEqualTo(expectedRegionDestroys());
+ }
+
+ @Test
+ public void afterRegionDestroyIsInvokedOnAccessor() {
+ CacheListener<String, Integer> listener = new RegionDestroyCountingCacheListener();
+ Region<String, Integer> region = createAccessorRegion(regionName, listener);
+
+ for (int i = 0; i < getVMCount(); i++) {
+ getVM(i).invoke(() -> {
+ withData(createRegion(regionName, null));
+ });
+ }
+
+ region.destroyRegion();
+
+ assertThat(sharedCountersRule.getTotal(REGION_DESTROY)).isEqualTo(1);
+ }
+
+ @Test
+ public void afterRegionDestroyIsInvokedNonOnNonAccessor() {
+ CacheListener<String, Integer> listener = new RegionDestroyCountingCacheListener();
+ Region<String, Integer> region = createAccessorRegion(regionName, null);
+ getVM(0).invoke(() -> {
+ createRegion(regionName, listener);
+ });
+ for (int i = 1; i < getVMCount(); i++) {
+ getVM(i).invoke(() -> {
+ withData(createRegion(regionName, null));
+ });
+ }
+
+ region.destroyRegion();
+
+ assertThat(sharedCountersRule.getTotal(REGION_DESTROY)).isEqualTo(1);
+ }
+
+ @Test
+ public void afterRegionClearIsInvokedInEveryMember() {
+ CacheListener<String, Integer> listener = new ClearCountingCacheListener();
+ Region<String, Integer> region = createRegion(regionName, listener);
+
+ for (int i = 0; i < getVMCount(); i++) {
+ getVM(i).invoke(() -> {
+ withData(createRegion(regionName, listener));
+ });
+ }
+
+ region.clear();
+
+ assertThat(sharedCountersRule.getTotal(CLEAR)).isEqualTo(expectedClears());
+ }
+
+ @Test
+ public void afterClearIsInvokedOnNodeWithListener() {
+ CacheListener<String, Integer> listener = new ClearCountingCacheListener();
+ Region<String, Integer> region = createRegion(regionName, listener);
+ for (int i = 0; i < getVMCount(); i++) {
+ getVM(i).invoke(() -> {
+ withData(createRegion(regionName, null));
+ });
+ }
+
+ region.clear();
+
+ assertThat(sharedCountersRule.getTotal(CLEAR)).isEqualTo(1);
+ }
+
+ @Test
+ public void afterRegionClearIsInvokedOnRemoteNodeWithListener() {
+ CacheListener<String, Integer> listener = new ClearCountingCacheListener();
+ Region<String, Integer> region = createRegion(regionName, null);
+ getVM(0).invoke(() -> {
+ createRegion(regionName, listener);
+ });
+ for (int i = 1; i < getVMCount(); i++) {
+ getVM(i).invoke(() -> {
+ withData(createRegion(regionName, null));
+ });
+ }
+
+ region.clear();
+
+ assertThat(sharedCountersRule.getTotal(CLEAR)).isEqualTo(1);
+ }
+
+ @Test
+ public void afterRegionClearIsInvokedOnAccessorAndDataMembers() {
+ CacheListener<String, Integer> listener = new ClearCountingCacheListener();
+ Region<String, Integer> region = createAccessorRegion(regionName, listener);
+
+ for (int i = 0; i < getVMCount(); i++) {
+ getVM(i).invoke(() -> {
+ withData(createRegion(regionName, listener));
+ });
+ }
+
+ region.clear();
+
+ assertThat(sharedCountersRule.getTotal(CLEAR)).isEqualTo(expectedRegionDestroys());
+ }
+
+ @Test
+ public void afterRegionClearIsInvokedOnAccessor() {
+ CacheListener<String, Integer> listener = new ClearCountingCacheListener();
+ Region<String, Integer> region = createAccessorRegion(regionName, listener);
+
+ for (int i = 0; i < getVMCount(); i++) {
+ getVM(i).invoke(() -> {
+ withData(createRegion(regionName, null));
+ });
+ }
+
+ region.clear();
+
+ assertThat(sharedCountersRule.getTotal(CLEAR)).isEqualTo(1);
+ }
+
+ @Test
+ public void afterRegionClearIsInvokedNonOnNonAccessor() {
Review comment:
Looks like there is a typo in the method name.
##########
File path: geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionAfterClearNotificationDUnitTest.java
##########
@@ -0,0 +1,379 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.geode.internal.cache;
+
+import static java.util.concurrent.TimeUnit.SECONDS;
+import static org.apache.geode.test.dunit.rules.ClusterStartupRule.getCache;
+import static org.apache.geode.test.dunit.rules.ClusterStartupRule.getClientCache;
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.Properties;
+import java.util.concurrent.TimeoutException;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.stream.IntStream;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+
+import org.apache.geode.cache.InterestResultPolicy;
+import org.apache.geode.cache.PartitionAttributesFactory;
+import org.apache.geode.cache.Region;
+import org.apache.geode.cache.RegionEvent;
+import org.apache.geode.cache.RegionShortcut;
+import org.apache.geode.cache.client.ClientRegionShortcut;
+import org.apache.geode.cache.server.CacheServer;
+import org.apache.geode.cache.util.CacheListenerAdapter;
+import org.apache.geode.distributed.internal.ClusterDistributionManager;
+import org.apache.geode.distributed.internal.DistributionMessage;
+import org.apache.geode.distributed.internal.DistributionMessageObserver;
+import org.apache.geode.test.awaitility.GeodeAwaitility;
+import org.apache.geode.test.dunit.AsyncInvocation;
+import org.apache.geode.test.dunit.DUnitBlackboard;
+import org.apache.geode.test.dunit.SerializableCallableIF;
+import org.apache.geode.test.dunit.rules.ClientVM;
+import org.apache.geode.test.dunit.rules.ClusterStartupRule;
+import org.apache.geode.test.dunit.rules.MemberVM;
+
+public class PartitionedRegionAfterClearNotificationDUnitTest implements Serializable {
+ protected static final String REGION_NAME = "testPR";
+ protected static final int NUM_ENTRIES = 100;
+
+ protected int locatorPort;
+ protected MemberVM locator;
+ protected MemberVM dataStore1, dataStore2, dataStore3, accessor;
+ protected ClientVM client1, client2;
Review comment:
It is recommended to declare one field per line.
##########
File path: geode-core/src/distributedTest/java/org/apache/geode/cache/PRCacheListenerDistributedTest.java
##########
@@ -79,4 +118,206 @@ protected int expectedInvalidates() {
protected int expectedDestroys() {
return 1;
}
+
+ @Test
+ public void afterRegionDestroyIsInvokedInEveryMember() {
+ CacheListener<String, Integer> listener = new RegionDestroyCountingCacheListener();
+ Region<String, Integer> region = createRegion(regionName, listener);
+
+ for (int i = 0; i < getVMCount(); i++) {
+ getVM(i).invoke(() -> {
+ withData(createRegion(regionName, listener));
+ });
+ }
+
+ region.destroyRegion();
+
+ assertThat(sharedCountersRule.getTotal(REGION_DESTROY)).isEqualTo(expectedRegionDestroys());
+ }
+
+ @Test
+ public void afterRegionDestroyIsInvokedOnNodeWithListener() {
+ CacheListener<String, Integer> listener = new RegionDestroyCountingCacheListener();
+ Region<String, Integer> region = createRegion(regionName, listener);
+
+ for (int i = 0; i < getVMCount(); i++) {
+ getVM(i).invoke(() -> {
+ withData(createRegion(regionName, null));
+ });
+ }
+
+ region.destroyRegion();
+
+ assertThat(sharedCountersRule.getTotal(REGION_DESTROY)).isEqualTo(1);
+ }
+
+ @Test
+ public void afterRegionDestroyIsInvokedOnRemoteNodeWithListener() {
+ CacheListener<String, Integer> listener = new RegionDestroyCountingCacheListener();
+ Region<String, Integer> region = createRegion(regionName, null);
+
+ getVM(0).invoke(() -> {
+ createRegion(regionName, listener);
+ });
+
+ for (int i = 1; i < getVMCount(); i++) {
+ getVM(i).invoke(() -> {
+ withData(createRegion(regionName, null));
+ });
+ }
+
+ region.destroyRegion();
+
+ assertThat(sharedCountersRule.getTotal(REGION_DESTROY)).isEqualTo(1);
+ }
+
+ @Test
+ public void afterRegionDestroyIsInvokedOnAccessorAndDataMembers() {
+ CacheListener<String, Integer> listener = new RegionDestroyCountingCacheListener();
+ Region<String, Integer> region = createAccessorRegion(regionName, listener);
+ for (int i = 0; i < getVMCount(); i++) {
+ getVM(i).invoke(() -> {
+ withData(createRegion(regionName, listener));
+ });
+ }
+
+ region.destroyRegion();
+
+ assertThat(sharedCountersRule.getTotal(REGION_DESTROY)).isEqualTo(expectedRegionDestroys());
+ }
+
+ @Test
+ public void afterRegionDestroyIsInvokedOnAccessor() {
+ CacheListener<String, Integer> listener = new RegionDestroyCountingCacheListener();
+ Region<String, Integer> region = createAccessorRegion(regionName, listener);
+
+ for (int i = 0; i < getVMCount(); i++) {
+ getVM(i).invoke(() -> {
+ withData(createRegion(regionName, null));
+ });
+ }
+
+ region.destroyRegion();
+
+ assertThat(sharedCountersRule.getTotal(REGION_DESTROY)).isEqualTo(1);
+ }
+
+ @Test
+ public void afterRegionDestroyIsInvokedNonOnNonAccessor() {
+ CacheListener<String, Integer> listener = new RegionDestroyCountingCacheListener();
+ Region<String, Integer> region = createAccessorRegion(regionName, null);
+ getVM(0).invoke(() -> {
+ createRegion(regionName, listener);
+ });
+ for (int i = 1; i < getVMCount(); i++) {
+ getVM(i).invoke(() -> {
+ withData(createRegion(regionName, null));
+ });
+ }
+
+ region.destroyRegion();
+
+ assertThat(sharedCountersRule.getTotal(REGION_DESTROY)).isEqualTo(1);
+ }
+
+ @Test
+ public void afterRegionClearIsInvokedInEveryMember() {
+ CacheListener<String, Integer> listener = new ClearCountingCacheListener();
+ Region<String, Integer> region = createRegion(regionName, listener);
+
+ for (int i = 0; i < getVMCount(); i++) {
+ getVM(i).invoke(() -> {
+ withData(createRegion(regionName, listener));
+ });
+ }
+
+ region.clear();
+
+ assertThat(sharedCountersRule.getTotal(CLEAR)).isEqualTo(expectedClears());
+ }
+
+ @Test
+ public void afterClearIsInvokedOnNodeWithListener() {
+ CacheListener<String, Integer> listener = new ClearCountingCacheListener();
+ Region<String, Integer> region = createRegion(regionName, listener);
+ for (int i = 0; i < getVMCount(); i++) {
+ getVM(i).invoke(() -> {
+ withData(createRegion(regionName, null));
+ });
+ }
+
+ region.clear();
+
+ assertThat(sharedCountersRule.getTotal(CLEAR)).isEqualTo(1);
+ }
+
+ @Test
+ public void afterRegionClearIsInvokedOnRemoteNodeWithListener() {
+ CacheListener<String, Integer> listener = new ClearCountingCacheListener();
+ Region<String, Integer> region = createRegion(regionName, null);
+ getVM(0).invoke(() -> {
+ createRegion(regionName, listener);
+ });
+ for (int i = 1; i < getVMCount(); i++) {
+ getVM(i).invoke(() -> {
+ withData(createRegion(regionName, null));
+ });
+ }
+
+ region.clear();
+
+ assertThat(sharedCountersRule.getTotal(CLEAR)).isEqualTo(1);
+ }
+
+ @Test
+ public void afterRegionClearIsInvokedOnAccessorAndDataMembers() {
+ CacheListener<String, Integer> listener = new ClearCountingCacheListener();
+ Region<String, Integer> region = createAccessorRegion(regionName, listener);
+
+ for (int i = 0; i < getVMCount(); i++) {
+ getVM(i).invoke(() -> {
+ withData(createRegion(regionName, listener));
+ });
+ }
+
+ region.clear();
+
+ assertThat(sharedCountersRule.getTotal(CLEAR)).isEqualTo(expectedRegionDestroys());
Review comment:
This should be `expectedClears()`, although `expectedRegionDestroys()` has the same value.
##########
File path: geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionAfterClearNotificationDUnitTest.java
##########
@@ -0,0 +1,379 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.geode.internal.cache;
+
+import static java.util.concurrent.TimeUnit.SECONDS;
+import static org.apache.geode.test.dunit.rules.ClusterStartupRule.getCache;
+import static org.apache.geode.test.dunit.rules.ClusterStartupRule.getClientCache;
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.Properties;
+import java.util.concurrent.TimeoutException;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.stream.IntStream;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+
+import org.apache.geode.cache.InterestResultPolicy;
+import org.apache.geode.cache.PartitionAttributesFactory;
+import org.apache.geode.cache.Region;
+import org.apache.geode.cache.RegionEvent;
+import org.apache.geode.cache.RegionShortcut;
+import org.apache.geode.cache.client.ClientRegionShortcut;
+import org.apache.geode.cache.server.CacheServer;
+import org.apache.geode.cache.util.CacheListenerAdapter;
+import org.apache.geode.distributed.internal.ClusterDistributionManager;
+import org.apache.geode.distributed.internal.DistributionMessage;
+import org.apache.geode.distributed.internal.DistributionMessageObserver;
+import org.apache.geode.test.awaitility.GeodeAwaitility;
+import org.apache.geode.test.dunit.AsyncInvocation;
+import org.apache.geode.test.dunit.DUnitBlackboard;
+import org.apache.geode.test.dunit.SerializableCallableIF;
+import org.apache.geode.test.dunit.rules.ClientVM;
+import org.apache.geode.test.dunit.rules.ClusterStartupRule;
+import org.apache.geode.test.dunit.rules.MemberVM;
+
+public class PartitionedRegionAfterClearNotificationDUnitTest implements Serializable {
+ protected static final String REGION_NAME = "testPR";
+ protected static final int NUM_ENTRIES = 100;
+
+ protected int locatorPort;
+ protected MemberVM locator;
+ protected MemberVM dataStore1, dataStore2, dataStore3, accessor;
+ protected ClientVM client1, client2;
+
+ private static volatile DUnitBlackboard blackboard;
+
+ @Rule
+ public ClusterStartupRule cluster = new ClusterStartupRule(7);
Review comment:
It is recommended not to use `ClusterStartupRule`.
##########
File path: geode-core/src/distributedTest/java/org/apache/geode/cache/ReplicateCacheListenerDistributedTest.java
##########
@@ -283,7 +325,12 @@ public void afterInvalidate(final EntryEvent<String, Integer> event) {
@Override
public void afterCreate(final EntryEvent<String, Integer> event) {
- // ignore
+ sharedCountersRule.increment(CREATES);
Review comment:
I don't see this counter `CREATES` is used in the test.
##########
File path: geode-core/src/distributedTest/java/org/apache/geode/cache/ReplicateCacheListenerDistributedTest.java
##########
@@ -283,7 +325,12 @@ public void afterInvalidate(final EntryEvent<String, Integer> event) {
@Override
public void afterCreate(final EntryEvent<String, Integer> event) {
- // ignore
+ sharedCountersRule.increment(CREATES);
+ }
+
+ @Override
+ public void afterUpdate(final EntryEvent<String, Integer> event) {
+ sharedCountersRule.increment(UPDATES);
Review comment:
I don't see this counter `UPDATES` is used in the test.
##########
File path: geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionAfterClearNotificationDUnitTest.java
##########
@@ -0,0 +1,379 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.geode.internal.cache;
+
+import static java.util.concurrent.TimeUnit.SECONDS;
+import static org.apache.geode.test.dunit.rules.ClusterStartupRule.getCache;
+import static org.apache.geode.test.dunit.rules.ClusterStartupRule.getClientCache;
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.Properties;
+import java.util.concurrent.TimeoutException;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.stream.IntStream;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+
+import org.apache.geode.cache.InterestResultPolicy;
+import org.apache.geode.cache.PartitionAttributesFactory;
+import org.apache.geode.cache.Region;
+import org.apache.geode.cache.RegionEvent;
+import org.apache.geode.cache.RegionShortcut;
+import org.apache.geode.cache.client.ClientRegionShortcut;
+import org.apache.geode.cache.server.CacheServer;
+import org.apache.geode.cache.util.CacheListenerAdapter;
+import org.apache.geode.distributed.internal.ClusterDistributionManager;
+import org.apache.geode.distributed.internal.DistributionMessage;
+import org.apache.geode.distributed.internal.DistributionMessageObserver;
+import org.apache.geode.test.awaitility.GeodeAwaitility;
+import org.apache.geode.test.dunit.AsyncInvocation;
+import org.apache.geode.test.dunit.DUnitBlackboard;
+import org.apache.geode.test.dunit.SerializableCallableIF;
+import org.apache.geode.test.dunit.rules.ClientVM;
+import org.apache.geode.test.dunit.rules.ClusterStartupRule;
+import org.apache.geode.test.dunit.rules.MemberVM;
+
+public class PartitionedRegionAfterClearNotificationDUnitTest implements Serializable {
+ protected static final String REGION_NAME = "testPR";
+ protected static final int NUM_ENTRIES = 100;
+
+ protected int locatorPort;
+ protected MemberVM locator;
+ protected MemberVM dataStore1, dataStore2, dataStore3, accessor;
Review comment:
It is recommended to declare one field per line.
##########
File path: geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionPersistentClearDUnitTest.java
##########
@@ -0,0 +1,26 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.geode.internal.cache;
+
+
+
+import org.apache.geode.cache.RegionShortcut;
+
+public class PartitionedRegionPersistentClearDUnitTest extends PartitionedRegionClearDUnitTest {
+
+ protected RegionShortcut getRegionShortCut() {
+ return RegionShortcut.PARTITION_REDUNDANT_PERSISTENT;
Review comment:
Is `PARTITION_REDUNDANT_PERSISTENT_OVERFLOW` covered in test as well?
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [geode] gesterzhou commented on a change in pull request #4987: GEODE-7678: Support for cache-listener and client-notification for Partitioned Region Clear operation.
Posted by GitBox <gi...@apache.org>.
gesterzhou commented on a change in pull request #4987:
URL: https://github.com/apache/geode/pull/4987#discussion_r416827787
##########
File path: geode-core/src/main/java/org/apache/geode/internal/cache/ClearPartitionedRegion.java
##########
@@ -0,0 +1,379 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.geode.internal.cache;
+
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Iterator;
+
+import org.apache.logging.log4j.Logger;
+
+import org.apache.geode.CancelException;
+import org.apache.geode.cache.Operation;
+import org.apache.geode.cache.partition.PartitionRegionHelper;
+import org.apache.geode.distributed.internal.DistributionManager;
+import org.apache.geode.distributed.internal.MembershipListener;
+import org.apache.geode.distributed.internal.ReplyException;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.cache.versions.RegionVersionVector;
+import org.apache.geode.logging.internal.log4j.api.LogService;
+
+public class ClearPartitionedRegion {
+
+ private static final Logger logger = LogService.getLogger();
+
+ private final PartitionedRegion partitionedRegion;
+
+ private LockForListenerAndClientNotification lockForListenerAndClientNotification =
+ new LockForListenerAndClientNotification();
+
+ private volatile boolean membershipchange = false;
+
+ public ClearPartitionedRegion(PartitionedRegion partitionedRegion) {
+ this.partitionedRegion = partitionedRegion;
+ partitionedRegion.getDistributionManager()
+ .addMembershipListener(new ClearPartitionedRegionListener());
+ }
+
+ public boolean isLockedForListenerAndClientNotification() {
+ return lockForListenerAndClientNotification.isLocked();
+ }
+
+ void acquireDistributedClearLock(String clearLock) {
+ try {
+ partitionedRegion.getPartitionedRegionLockService().lock(clearLock, -1, -1);
+ } catch (IllegalStateException e) {
+ partitionedRegion.lockCheckReadiness();
+ throw e;
+ }
+ }
+
+ void releaseDistributedClearLock(String clearLock) {
+ try {
+ partitionedRegion.getPartitionedRegionLockService().unlock(clearLock);
+ } catch (IllegalStateException e) {
+ partitionedRegion.lockCheckReadiness();
+ } catch (Exception ex) {
+ logger.warn("Caught exception while unlocking clear distributed lock", ex.getMessage());
+ }
+ }
+
+ void obtainLockForClear(RegionEventImpl event) {
+ sendClearRegionMessage(event,
+ ClearPartitionedRegionMessage.OperationType.OP_LOCK_FOR_PR_CLEAR);
+ obtainClearLockLocal(partitionedRegion.getDistributionManager().getId());
+ }
+
+ void releaseLockForClear(RegionEventImpl event) {
+ sendClearRegionMessage(event,
Review comment:
sendClearRegionMessage is better to rename to sendClearPartitionedRegionMessage, because later you are sending ClearPartitionedRegionMessage
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [geode] agingade commented on a change in pull request #4987: GEODE-7678: Support for cache-listener and client-notification for Partitioned Region Clear operation.
Posted by GitBox <gi...@apache.org>.
agingade commented on a change in pull request #4987:
URL: https://github.com/apache/geode/pull/4987#discussion_r426081372
##########
File path: geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionAfterClearNotificationDUnitTest.java
##########
@@ -0,0 +1,379 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.geode.internal.cache;
+
+import static java.util.concurrent.TimeUnit.SECONDS;
+import static org.apache.geode.test.dunit.rules.ClusterStartupRule.getCache;
+import static org.apache.geode.test.dunit.rules.ClusterStartupRule.getClientCache;
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.Properties;
+import java.util.concurrent.TimeoutException;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.stream.IntStream;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+
+import org.apache.geode.cache.InterestResultPolicy;
+import org.apache.geode.cache.PartitionAttributesFactory;
+import org.apache.geode.cache.Region;
+import org.apache.geode.cache.RegionEvent;
+import org.apache.geode.cache.RegionShortcut;
+import org.apache.geode.cache.client.ClientRegionShortcut;
+import org.apache.geode.cache.server.CacheServer;
+import org.apache.geode.cache.util.CacheListenerAdapter;
+import org.apache.geode.distributed.internal.ClusterDistributionManager;
+import org.apache.geode.distributed.internal.DistributionMessage;
+import org.apache.geode.distributed.internal.DistributionMessageObserver;
+import org.apache.geode.test.awaitility.GeodeAwaitility;
+import org.apache.geode.test.dunit.AsyncInvocation;
+import org.apache.geode.test.dunit.DUnitBlackboard;
+import org.apache.geode.test.dunit.SerializableCallableIF;
+import org.apache.geode.test.dunit.rules.ClientVM;
+import org.apache.geode.test.dunit.rules.ClusterStartupRule;
+import org.apache.geode.test.dunit.rules.MemberVM;
+
+public class PartitionedRegionAfterClearNotificationDUnitTest implements Serializable {
+ protected static final String REGION_NAME = "testPR";
+ protected static final int NUM_ENTRIES = 100;
+
+ protected int locatorPort;
+ protected MemberVM locator;
+ protected MemberVM dataStore1, dataStore2, dataStore3, accessor;
+ protected ClientVM client1, client2;
+
+ private static volatile DUnitBlackboard blackboard;
+
+ @Rule
+ public ClusterStartupRule cluster = new ClusterStartupRule(7);
+
+ @Before
+ public void setUp() throws Exception {
+ locator = cluster.startLocatorVM(0);
+ locatorPort = locator.getPort();
+ dataStore1 = cluster.startServerVM(1, getProperties(), locatorPort);
+ dataStore2 = cluster.startServerVM(2, getProperties(), locatorPort);
+ dataStore3 = cluster.startServerVM(3, getProperties(), locatorPort);
+ accessor = cluster.startServerVM(4, getProperties(), locatorPort);
+
+ client1 = cluster.startClientVM(5,
+ c -> c.withPoolSubscription(true).withLocatorConnection((locatorPort)));
+ client2 = cluster.startClientVM(6,
+ c -> c.withPoolSubscription(true).withLocatorConnection((locatorPort)));
+
+ dataStore1.invoke(this::initDataStore);
+ dataStore2.invoke(this::initDataStore);
+ dataStore3.invoke(this::initDataStore);
+ accessor.invoke(this::initAccessor);
+
+ getBlackboard().initBlackboard();
+ }
+
+ protected RegionShortcut getRegionShortCut() {
+ return RegionShortcut.PARTITION_REDUNDANT;
+ }
Review comment:
Yes...I will it as is now.
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [geode] DonalEvans commented on a change in pull request #4987: GEODE-7678: Support for cache-listener and client-notification for Partitioned Region Clear operation.
Posted by GitBox <gi...@apache.org>.
DonalEvans commented on a change in pull request #4987:
URL: https://github.com/apache/geode/pull/4987#discussion_r419535253
##########
File path: geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegionClear.java
##########
@@ -30,18 +31,22 @@
import org.apache.geode.internal.cache.versions.RegionVersionVector;
import org.apache.geode.logging.internal.log4j.api.LogService;
-public class ClearPartitionedRegion {
+public class PartitionedRegionClear {
private static final Logger logger = LogService.getLogger();
+ private static final String CLEAR_OPERATION = "_clearOperation";
+
+ private final int retryTime = 2 * 60 * 1000 /* partitionedRegion.getRetryTimeout() */;
Review comment:
@agingade I see. So this timeout is kind of unique to this step in the clear operation and so isn't needed/tracked anywhere else.
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [geode] gesterzhou commented on a change in pull request #4987: GEODE-7678: Support for cache-listener and client-notification for Partitioned Region Clear operation.
Posted by GitBox <gi...@apache.org>.
gesterzhou commented on a change in pull request #4987:
URL: https://github.com/apache/geode/pull/4987#discussion_r414718063
##########
File path: geode-core/src/main/java/org/apache/geode/internal/cache/ClearPartitionedRegion.java
##########
@@ -0,0 +1,347 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.geode.internal.cache;
+
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Iterator;
+
+import org.apache.logging.log4j.Logger;
+
+import org.apache.geode.CancelException;
+import org.apache.geode.cache.Operation;
+import org.apache.geode.cache.partition.PartitionRegionHelper;
+import org.apache.geode.distributed.internal.DistributionManager;
+import org.apache.geode.distributed.internal.MembershipListener;
+import org.apache.geode.distributed.internal.ReplyException;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.cache.versions.RegionVersionVector;
+import org.apache.geode.logging.internal.log4j.api.LogService;
+
+public class ClearPartitionedRegion {
+
+ private static final Logger logger = LogService.getLogger();
+
+ private final PartitionedRegion partitionedRegion;
+
+ private LockForListenerAndClientNotification lockForListenerAndClientNotification =
+ new LockForListenerAndClientNotification();
+
+ public ClearPartitionedRegion(PartitionedRegion partitionedRegion) {
+ this.partitionedRegion = partitionedRegion;
+ partitionedRegion.getDistributionManager()
+ .addMembershipListener(new ClearPartitionedRegionListener());
+ }
+
+ public boolean isLockedForListenerAndClientNotification() {
+ return lockForListenerAndClientNotification.isLocked();
+ }
+
+ void acquireDistributedClearLock(String clearLock) {
+ try {
+ partitionedRegion.getPartitionedRegionLockService().lock(clearLock, -1, -1);
+ } catch (IllegalStateException e) {
+ partitionedRegion.lockCheckReadiness();
+ throw e;
+ }
+ }
+
+ void releaseDistributedClearLock(String clearLock) {
+ try {
+ partitionedRegion.getPartitionedRegionLockService().unlock(clearLock);
+ } catch (IllegalStateException e) {
+ partitionedRegion.lockCheckReadiness();
+ } catch (Exception ex) {
+ logger.warn("Caught exception while unlocking clear distributed lock", ex.getMessage());
+ }
+ }
+
+ void obtainWriteLockForClear(RegionEventImpl event) {
+ sendLocalClearRegionMessage(event,
+ ClearPartitionedRegionMessage.OperationType.OP_LOCK_FOR_CLEAR);
+ obtainClearLockLocal(partitionedRegion.getDistributionManager().getId());
+ }
+
+ void releaseWriteLockForClear(RegionEventImpl event) {
+ sendLocalClearRegionMessage(event,
+ ClearPartitionedRegionMessage.OperationType.OP_UNLOCK_FOR_CLEAR);
+ releaseClearLockLocal();
+ }
+
+ void clearRegion(RegionEventImpl regionEvent, boolean cacheWrite,
+ RegionVersionVector vector) {
+ clearRegionLocal(regionEvent, cacheWrite, null);
+ sendLocalClearRegionMessage(regionEvent,
+ ClearPartitionedRegionMessage.OperationType.OP_CLEAR);
+ }
+
+ public void clearRegionLocal(RegionEventImpl regionEvent, boolean cacheWrite,
+ RegionVersionVector vector) {
+ logger.info("#### CPR.clearRegionLocal", new Exception("DEBUG"));
+ // Synchronized to handle the requester departure.
+ synchronized (lockForListenerAndClientNotification) {
+ if (partitionedRegion.getDataStore() != null) {
+ partitionedRegion.getDataStore().lockBucketCreationForRegionClear();
+ try {
+ for (BucketRegion localPrimaryBucketRegion : partitionedRegion.getDataStore()
+ .getAllLocalPrimaryBucketRegions()) {
+ localPrimaryBucketRegion.clear();
+ }
+ doAfterClear(regionEvent);
+ } finally {
+ partitionedRegion.getDataStore().unLockBucketCreationForRegionClear();
+ }
+ } else {
+ // Non data-store with client queue and listener
+ doAfterClear(regionEvent);
+ }
+ }
+ }
+
+ private void doAfterClear(RegionEventImpl regionEvent) {
+ logger
+ .info("#### doAfterClear clientInterested: " + partitionedRegion.hasAnyClientsInterested());
+ if (partitionedRegion.hasAnyClientsInterested()) {
+ notifyClients(regionEvent);
+ }
+
+ if (partitionedRegion.hasListener()) {
+ partitionedRegion.dispatchListenerEvent(EnumListenerEvent.AFTER_REGION_CLEAR, regionEvent);
+ }
+ }
+
+ void notifyClients(RegionEventImpl event) {
+ // Set client routing information into the event
+ // The clear operation in case of PR is distributed differently
+ // hence the FilterRoutingInfo is set here instead of
+ // DistributedCacheOperation.distribute().
+ event.setEventType(EnumListenerEvent.AFTER_REGION_CLEAR);
+ if (!partitionedRegion.isUsedForMetaRegion() && !partitionedRegion
+ .isUsedForPartitionedRegionAdmin()
+ && !partitionedRegion.isUsedForPartitionedRegionBucket() && !partitionedRegion
+ .isUsedForParallelGatewaySenderQueue()) {
+
+ FilterRoutingInfo localCqFrInfo =
+ partitionedRegion.getFilterProfile().getFilterRoutingInfoPart1(event,
+ FilterProfile.NO_PROFILES, Collections.emptySet());
+
+ FilterRoutingInfo localCqInterestFrInfo =
+ partitionedRegion.getFilterProfile().getFilterRoutingInfoPart2(localCqFrInfo, event);
+
+ if (localCqInterestFrInfo != null) {
+ event.setLocalFilterInfo(localCqInterestFrInfo.getLocalFilterInfo());
+ }
+ }
+ partitionedRegion.notifyBridgeClients(event);
+ }
+
+ protected void obtainClearLockLocal(InternalDistributedMember requester) {
+ synchronized (lockForListenerAndClientNotification) {
Review comment:
do you need to sync here? There's only one thread in the whole cluster can do the clear at any time.
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [geode] agingade commented on a change in pull request #4987: GEODE-7678: Support for cache-listener and client-notification for Partitioned Region Clear operation.
Posted by GitBox <gi...@apache.org>.
agingade commented on a change in pull request #4987:
URL: https://github.com/apache/geode/pull/4987#discussion_r425397681
##########
File path: geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegionClear.java
##########
@@ -30,18 +31,22 @@
import org.apache.geode.internal.cache.versions.RegionVersionVector;
import org.apache.geode.logging.internal.log4j.api.LogService;
-public class ClearPartitionedRegion {
+public class PartitionedRegionClear {
private static final Logger logger = LogService.getLogger();
+ private static final String CLEAR_OPERATION = "_clearOperation";
+
+ private final int retryTime = 2 * 60 * 1000 /* partitionedRegion.getRetryTimeout() */;
Review comment:
Thats right.
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [geode] agingade commented on a change in pull request #4987: GEODE-7678: Support for cache-listener and client-notification for Partitioned Region Clear operation.
Posted by GitBox <gi...@apache.org>.
agingade commented on a change in pull request #4987:
URL: https://github.com/apache/geode/pull/4987#discussion_r425401653
##########
File path: geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionClearWithExpirationDUnitTest.java
##########
@@ -281,6 +283,19 @@ private void registerVMKillerAsCacheWriter(List<VM> vmsToBounce) {
}));
}
Review comment:
I have run this on machine many a times, and it finishes in 11 or 12 min. I am guessing it could be an environment issue.
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [geode] lgtm-com[bot] commented on pull request #4987: GEODE-7678: Support for cache-listener and client-notification for Partitioned Region Clear operation.
Posted by GitBox <gi...@apache.org>.
lgtm-com[bot] commented on pull request #4987:
URL: https://github.com/apache/geode/pull/4987#issuecomment-628947727
This pull request **introduces 122 alerts** and **fixes 2** when merging 17f39032d84adc6d8584bdc61b1f1f16a5977e5a into 81102ceb497c00d92adfc55505ba38fe18e7d788 - [view on LGTM.com](https://lgtm.com/projects/g/apache/geode/rev/pr-92470d0d8715a1640e75b28b6c1f7fb574b4b6e8)
**new alerts:**
* 49 for Useless null check
* 29 for Missing space in string literal
* 19 for Non\-synchronized override of synchronized method
* 4 for Implicit conversion from array to string
* 3 for Equals method does not inspect argument type
* 3 for Dereferenced variable may be null
* 3 for Implicit narrowing conversion in compound assignment
* 2 for Container contents are never accessed
* 2 for Result of multiplication cast to wider type
* 2 for Potential database resource leak
* 2 for Spurious Javadoc @param tags
* 1 for Information exposure through a stack trace
* 1 for Potential output resource leak
* 1 for Boxed variable is never null
* 1 for Race condition in double\-checked locking object initialization
**fixed alerts:**
* 1 for Useless null check
* 1 for Disabled Spring CSRF protection
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [geode] DonalEvans commented on a change in pull request #4987: GEODE-7678: Support for cache-listener and client-notification for Partitioned Region Clear operation.
Posted by GitBox <gi...@apache.org>.
DonalEvans commented on a change in pull request #4987:
URL: https://github.com/apache/geode/pull/4987#discussion_r416766676
##########
File path: geode-core/src/distributedTest/java/org/apache/geode/cache/ReplicateCacheListenerDistributedTest.java
##########
@@ -302,4 +349,64 @@ public void afterDestroy(final EntryEvent<String, Integer> event) {
errorCollector.checkThat(event.getNewValue(), nullValue());
}
}
+
+ protected class ClearCountingCacheListener extends BaseCacheListener {
Review comment:
Is there a reason that we need six different CacheListener implementations here? Would it be possible to combine them into one? If not, for consistency, it might be good to have each one only implement the "afterX" method that that listener actually cares about, like how the `InvalidateCountingCacheListener` only implements the `afterInvalidate` method.
##########
File path: geode-core/src/distributedTest/java/org/apache/geode/cache/PRCacheListenerDistributedTest.java
##########
@@ -38,22 +45,57 @@
@SuppressWarnings("serial")
public class PRCacheListenerDistributedTest extends ReplicateCacheListenerDistributedTest {
- @Parameters(name = "{index}: redundancy={0}")
- public static Iterable<Integer> data() {
- return Arrays.asList(0, 3);
+ @Parameters
+ public static Collection<Object[]> data() {
+ return Arrays.asList(new Object[][] {
+ {1, Boolean.FALSE},
+ {3, Boolean.TRUE},
+ });
}
@Parameter
public int redundancy;
+ @Parameter(1)
+ public Boolean withData;
+
@Override
protected Region<String, Integer> createRegion(final String name,
final CacheListener<String, Integer> listener) {
+ LogService.getLogger()
+ .info("Params [Redundancy: " + redundancy + " withData:" + withData + "]");
PartitionAttributesFactory<String, Integer> paf = new PartitionAttributesFactory<>();
paf.setRedundantCopies(redundancy);
RegionFactory<String, Integer> regionFactory = cacheRule.getCache().createRegionFactory();
- regionFactory.addCacheListener(listener);
+ if (listener != null) {
+ regionFactory.addCacheListener(listener);
+ }
+ regionFactory.setDataPolicy(DataPolicy.PARTITION);
+ regionFactory.setPartitionAttributes(paf.create());
+
+ return regionFactory.create(name);
+ }
+
+ private void withData(Region region) {
+ if (withData) {
+ // Fewer buckets.
+ // Covers case where node doesn';'t have any buckets depending on redundancy.
Review comment:
Small typo here, should be `doesn't`.
##########
File path: geode-core/src/main/java/org/apache/geode/internal/cache/ClearPartitionedRegion.java
##########
@@ -0,0 +1,379 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.geode.internal.cache;
+
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Iterator;
+
+import org.apache.logging.log4j.Logger;
+
+import org.apache.geode.CancelException;
+import org.apache.geode.cache.Operation;
+import org.apache.geode.cache.partition.PartitionRegionHelper;
+import org.apache.geode.distributed.internal.DistributionManager;
+import org.apache.geode.distributed.internal.MembershipListener;
+import org.apache.geode.distributed.internal.ReplyException;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.cache.versions.RegionVersionVector;
+import org.apache.geode.logging.internal.log4j.api.LogService;
+
+public class ClearPartitionedRegion {
+
+ private static final Logger logger = LogService.getLogger();
+
+ private final PartitionedRegion partitionedRegion;
+
+ private LockForListenerAndClientNotification lockForListenerAndClientNotification =
Review comment:
Could this also be `final`?
##########
File path: geode-core/src/main/java/org/apache/geode/internal/cache/ClearPartitionedRegion.java
##########
@@ -0,0 +1,379 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.geode.internal.cache;
+
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Iterator;
+
+import org.apache.logging.log4j.Logger;
+
+import org.apache.geode.CancelException;
+import org.apache.geode.cache.Operation;
+import org.apache.geode.cache.partition.PartitionRegionHelper;
+import org.apache.geode.distributed.internal.DistributionManager;
+import org.apache.geode.distributed.internal.MembershipListener;
+import org.apache.geode.distributed.internal.ReplyException;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.cache.versions.RegionVersionVector;
+import org.apache.geode.logging.internal.log4j.api.LogService;
+
+public class ClearPartitionedRegion {
+
+ private static final Logger logger = LogService.getLogger();
+
+ private final PartitionedRegion partitionedRegion;
+
+ private LockForListenerAndClientNotification lockForListenerAndClientNotification =
+ new LockForListenerAndClientNotification();
+
+ private volatile boolean membershipchange = false;
Review comment:
This should probably be membershipChange.
##########
File path: geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionAfterClearNotificationDUnitTest.java
##########
@@ -0,0 +1,388 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.geode.internal.cache;
+
+import static java.util.concurrent.TimeUnit.SECONDS;
+import static org.apache.geode.internal.Assert.fail;
+import static org.apache.geode.test.dunit.rules.ClusterStartupRule.getCache;
+import static org.apache.geode.test.dunit.rules.ClusterStartupRule.getClientCache;
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.Properties;
+import java.util.concurrent.TimeoutException;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.stream.IntStream;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+
+import org.apache.geode.cache.InterestResultPolicy;
+import org.apache.geode.cache.PartitionAttributesFactory;
+import org.apache.geode.cache.Region;
+import org.apache.geode.cache.RegionEvent;
+import org.apache.geode.cache.RegionShortcut;
+import org.apache.geode.cache.client.ClientRegionShortcut;
+import org.apache.geode.cache.server.CacheServer;
+import org.apache.geode.cache.util.CacheListenerAdapter;
+import org.apache.geode.distributed.internal.ClusterDistributionManager;
+import org.apache.geode.distributed.internal.DistributionMessage;
+import org.apache.geode.distributed.internal.DistributionMessageObserver;
+import org.apache.geode.test.awaitility.GeodeAwaitility;
+import org.apache.geode.test.dunit.AsyncInvocation;
+import org.apache.geode.test.dunit.DUnitBlackboard;
+import org.apache.geode.test.dunit.SerializableCallableIF;
+import org.apache.geode.test.dunit.rules.ClientVM;
+import org.apache.geode.test.dunit.rules.ClusterStartupRule;
+import org.apache.geode.test.dunit.rules.MemberVM;
+
+public class PartitionedRegionAfterClearNotificationDUnitTest implements Serializable {
+ protected static final String REGION_NAME = "testPR";
+ protected static final int NUM_ENTRIES = 100;
+
+ protected int locatorPort;
+ protected MemberVM locator;
+ protected MemberVM dataStore1, dataStore2, dataStore3, accessor;
+ protected ClientVM client1, client2;
+
+ private static final Logger logger = LogManager.getLogger();
+
+ private static volatile DUnitBlackboard blackboard;
+
+ @Rule
+ public ClusterStartupRule cluster = new ClusterStartupRule(7);
+
+ @Before
+ public void setUp() throws Exception {
+ locator = cluster.startLocatorVM(0);
+ locatorPort = locator.getPort();
+ dataStore1 = cluster.startServerVM(1, getProperties(), locatorPort);
+ dataStore2 = cluster.startServerVM(2, getProperties(), locatorPort);
+ dataStore3 = cluster.startServerVM(3, getProperties(), locatorPort);
+ accessor = cluster.startServerVM(4, getProperties(), locatorPort);
+
+ client1 = cluster.startClientVM(5,
+ c -> c.withPoolSubscription(true).withLocatorConnection((locatorPort)));
+ client2 = cluster.startClientVM(6,
+ c -> c.withPoolSubscription(true).withLocatorConnection((locatorPort)));
+
+ dataStore1.invoke(this::initDataStore);
+ dataStore2.invoke(this::initDataStore);
+ dataStore3.invoke(this::initDataStore);
+ accessor.invoke(this::initAccessor);
+
+ getBlackboard().initBlackboard();
+ }
+
+ protected RegionShortcut getRegionShortCut() {
+ return RegionShortcut.PARTITION_REDUNDANT;
+ }
+
+ protected Properties getProperties() {
+ Properties properties = new Properties();
+ // properties.setProperty("log-level", "info");
+ return properties;
+ }
+
+ private Region getRegion(boolean isClient) {
+ if (isClient) {
+ return getClientCache().getRegion(REGION_NAME);
+ } else {
+ return getCache().getRegion(REGION_NAME);
+ }
+ }
+
+ private void verifyRegionSize(boolean isClient, int expectedNum) {
+ GeodeAwaitility.await().atMost(10, SECONDS)
+ .untilAsserted(() -> assertThat(getRegion(isClient).size()).isEqualTo(expectedNum));
+ }
+
+ private void initClientCache() {
+ Region region = getClientCache().createClientRegionFactory(ClientRegionShortcut.CACHING_PROXY)
+ .create(REGION_NAME);
+ region.registerInterestForAllKeys(InterestResultPolicy.KEYS);
+ }
+
+ private void stopServers() {
+ List<CacheServer> cacheServers = getCache().getCacheServers();
+ for (CacheServer server : cacheServers) {
+ server.stop();
+ }
+ }
+
+ private void initDataStore() {
+ getCache().createRegionFactory(getRegionShortCut())
+ .setPartitionAttributes(new PartitionAttributesFactory().setTotalNumBuckets(10).create())
+ .addCacheListener(new CountingCacheListener())
+ .create(REGION_NAME);
+ }
+
+ private void initAccessor() {
+ RegionShortcut shortcut = getRegionShortCut();
+ if (shortcut.isPersistent()) {
+ if (shortcut == RegionShortcut.PARTITION_PERSISTENT) {
+ shortcut = RegionShortcut.PARTITION;
+ } else if (shortcut == RegionShortcut.PARTITION_PERSISTENT_OVERFLOW) {
+ shortcut = RegionShortcut.PARTITION_OVERFLOW;
+ } else if (shortcut == RegionShortcut.PARTITION_REDUNDANT_PERSISTENT) {
+ shortcut = RegionShortcut.PARTITION_REDUNDANT;
+ } else if (shortcut == RegionShortcut.PARTITION_REDUNDANT_PERSISTENT_OVERFLOW) {
+ shortcut = RegionShortcut.PARTITION_REDUNDANT_OVERFLOW;
+ } else {
+ fail("Wrong region type:" + shortcut);
+ }
+ }
+ getCache().createRegionFactory(shortcut)
+ .setPartitionAttributes(
+ new PartitionAttributesFactory().setTotalNumBuckets(10).setLocalMaxMemory(0).create())
+ .addCacheListener(new CountingCacheListener())
+ .create(REGION_NAME);
+ }
+
+ private void feed(boolean isClient) {
+ Region region = getRegion(isClient);
+ IntStream.range(0, NUM_ENTRIES).forEach(i -> region.put(i, "value" + i));
+ }
+
+ private void verifyServerRegionSize(int expectedNum) {
+ accessor.invoke(() -> verifyRegionSize(false, expectedNum));
+ dataStore1.invoke(() -> verifyRegionSize(false, expectedNum));
+ dataStore2.invoke(() -> verifyRegionSize(false, expectedNum));
+ dataStore3.invoke(() -> verifyRegionSize(false, expectedNum));
+ }
+
+ private void verifyClientRegionSize(int expectedNum) {
+ client1.invoke(() -> verifyRegionSize(true, expectedNum));
+ client2.invoke(() -> verifyRegionSize(true, expectedNum));
+ }
+
+ private void verifyCacheListenerTriggerCount(MemberVM serverVM) {
+ SerializableCallableIF<Integer> getListenerTriggerCount = () -> {
+ CountingCacheListener countingCacheListener =
+ (CountingCacheListener) getRegion(false).getAttributes()
+ .getCacheListeners()[0];
+ return countingCacheListener.getClears();
+ };
+
+ int count = accessor.invoke(getListenerTriggerCount)
+ + dataStore1.invoke(getListenerTriggerCount)
+ + dataStore2.invoke(getListenerTriggerCount)
+ + dataStore3.invoke(getListenerTriggerCount);
+ assertThat(count).isEqualTo(4);
+
+ if (serverVM != null) {
+ assertThat(serverVM.invoke(getListenerTriggerCount)).isEqualTo(1);
+ }
+ }
+
+ @Test
+ public void normalClearFromDataStore() {
+ accessor.invoke(() -> feed(false));
+ verifyServerRegionSize(NUM_ENTRIES);
+
+ dataStore1.invoke(() -> getRegion(false).clear());
+
+ verifyServerRegionSize(0);
+ verifyCacheListenerTriggerCount(dataStore1);
+ }
+
+ @Test
+ public void normalClearFromAccessor() {
+ accessor.invoke(() -> feed(false));
+ verifyServerRegionSize(NUM_ENTRIES);
+ accessor.invoke(() -> getRegion(false).clear());
+ verifyServerRegionSize(0);
+ verifyCacheListenerTriggerCount(accessor);
+ }
+
+ @Test
+ public void normalClearFromClient() {
+ client1.invoke(this::initClientCache);
+ client2.invoke(this::initClientCache);
+
+ client1.invoke(() -> feed(true));
+ verifyClientRegionSize(NUM_ENTRIES);
+ verifyServerRegionSize(NUM_ENTRIES);
+
+ client1.invoke(() -> getRegion(true).clear());
+
+ verifyServerRegionSize(0);
+ verifyClientRegionSize(0);
+ verifyCacheListenerTriggerCount(null);
+ }
+
+ @Test
+ public void clearFromClientWithAccessorAsServer() {
+ dataStore1.invoke(this::stopServers);
+ dataStore2.invoke(this::stopServers);
+ dataStore3.invoke(this::stopServers);
+
+ client1.invoke(this::initClientCache);
+ client2.invoke(this::initClientCache);
+
+ client1.invoke(() -> feed(true));
+ verifyClientRegionSize(NUM_ENTRIES);
+ verifyServerRegionSize(NUM_ENTRIES);
+
+ client1.invoke(() -> getRegion(true).clear());
+
+ verifyServerRegionSize(0);
+ verifyClientRegionSize(0);
+ verifyCacheListenerTriggerCount(null);
+ }
+
+ @Test
+ public void normalClearFromDataStoreWithClientInterest() {
+ client1.invoke(this::initClientCache);
+ client2.invoke(this::initClientCache);
+
+ accessor.invoke(() -> feed(false));
+ verifyServerRegionSize(NUM_ENTRIES);
+
+ dataStore1.invoke(() -> getRegion(false).clear());
+
+ verifyServerRegionSize(0);
+ verifyCacheListenerTriggerCount(dataStore1);
+ }
+
+ @Test(expected = AssertionError.class)
+ public void verifyTheLocksAreClearedWhenMemberDepartsAfterTakingClearLockOnRemoteMembers()
+ throws Exception {
+ client1.invoke(this::initClientCache);
+ client2.invoke(this::initClientCache);
+
+ accessor.invoke(() -> feed(false));
+ verifyServerRegionSize(NUM_ENTRIES);
+ dataStore2.invoke(() -> DistributionMessageObserver.setInstance(
+ testHookToKillMemberCallingClearBeforeMessageProcessed()));
+
+ AsyncInvocation ds1ClearAsync = dataStore1.invokeAsync(() -> getRegion(false).clear());
+
+ getBlackboard().waitForGate("CacheClose", 30, SECONDS);
Review comment:
The gate names "CacheClose" and "CacheClosed" are very similar. It might be better to extract the strings to constants with names like `START_CACHE_CLOSE` and `CACHE_CLOSE_COMPLETE` or something similarly descriptive.
##########
File path: geode-core/src/main/java/org/apache/geode/internal/cache/ClearPartitionedRegion.java
##########
@@ -0,0 +1,379 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.geode.internal.cache;
+
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Iterator;
+
+import org.apache.logging.log4j.Logger;
+
+import org.apache.geode.CancelException;
+import org.apache.geode.cache.Operation;
+import org.apache.geode.cache.partition.PartitionRegionHelper;
+import org.apache.geode.distributed.internal.DistributionManager;
+import org.apache.geode.distributed.internal.MembershipListener;
+import org.apache.geode.distributed.internal.ReplyException;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.cache.versions.RegionVersionVector;
+import org.apache.geode.logging.internal.log4j.api.LogService;
+
+public class ClearPartitionedRegion {
+
+ private static final Logger logger = LogService.getLogger();
+
+ private final PartitionedRegion partitionedRegion;
+
+ private LockForListenerAndClientNotification lockForListenerAndClientNotification =
+ new LockForListenerAndClientNotification();
+
+ private volatile boolean membershipchange = false;
+
+ public ClearPartitionedRegion(PartitionedRegion partitionedRegion) {
+ this.partitionedRegion = partitionedRegion;
+ partitionedRegion.getDistributionManager()
+ .addMembershipListener(new ClearPartitionedRegionListener());
+ }
+
+ public boolean isLockedForListenerAndClientNotification() {
+ return lockForListenerAndClientNotification.isLocked();
+ }
+
+ void acquireDistributedClearLock(String clearLock) {
+ try {
+ partitionedRegion.getPartitionedRegionLockService().lock(clearLock, -1, -1);
+ } catch (IllegalStateException e) {
+ partitionedRegion.lockCheckReadiness();
+ throw e;
+ }
+ }
+
+ void releaseDistributedClearLock(String clearLock) {
+ try {
+ partitionedRegion.getPartitionedRegionLockService().unlock(clearLock);
+ } catch (IllegalStateException e) {
+ partitionedRegion.lockCheckReadiness();
+ } catch (Exception ex) {
+ logger.warn("Caught exception while unlocking clear distributed lock", ex.getMessage());
+ }
+ }
+
+ void obtainLockForClear(RegionEventImpl event) {
+ sendClearRegionMessage(event,
+ ClearPartitionedRegionMessage.OperationType.OP_LOCK_FOR_PR_CLEAR);
+ obtainClearLockLocal(partitionedRegion.getDistributionManager().getId());
+ }
+
+ void releaseLockForClear(RegionEventImpl event) {
+ sendClearRegionMessage(event,
+ ClearPartitionedRegionMessage.OperationType.OP_UNLOCK_FOR_PR_CLEAR);
+ releaseClearLockLocal();
+ }
+
+ void clearRegion(RegionEventImpl regionEvent, boolean cacheWrite,
+ RegionVersionVector vector) {
+ clearRegionLocal(regionEvent, cacheWrite, null);
+ sendClearRegionMessage(regionEvent,
+ ClearPartitionedRegionMessage.OperationType.OP_PR_CLEAR);
+ }
+
+ private void waitForPrimary() {
+ boolean retry;
+ int retryTime = 2 * 60 * 1000 /* partitionedRegion.getRetryTimeout() */;
+ PartitionedRegion.RetryTimeKeeper retryTimer = new PartitionedRegion.RetryTimeKeeper(retryTime);
+ do {
+ retry = false;
+ for (BucketRegion bucketRegion : partitionedRegion.getDataStore()
+ .getAllLocalBucketRegions()) {
+ if (!bucketRegion.getBucketAdvisor().hasPrimary()) {
+ if (retryTimer.overMaximum()) {
+ PRHARedundancyProvider.timedOut(partitionedRegion, null, null,
+ "do clear. Missing primary bucket",
+ retryTime);
+ }
+ retryTimer.waitForBucketsRecovery();
+ retry = true;
+ }
+ }
+ } while (retry);
+ }
+
+ public void clearRegionLocal(RegionEventImpl regionEvent, boolean cacheWrite,
+ RegionVersionVector vector) {
+ // Synchronized to handle the requester departure.
+ synchronized (lockForListenerAndClientNotification) {
+ if (partitionedRegion.getDataStore() != null) {
+ partitionedRegion.getDataStore().lockBucketCreationForRegionClear();
+ try {
+ boolean retry;
+ do {
+ retry = false;
+ for (BucketRegion localPrimaryBucketRegion : partitionedRegion.getDataStore()
+ .getAllLocalPrimaryBucketRegions()) {
+ if (localPrimaryBucketRegion.size() > 0) {
+ localPrimaryBucketRegion.clear();
+ }
+ }
+ if (membershipchange) {
+ membershipchange = false;
+ retry = true;
+ waitForPrimary();
+ }
+ } while (retry);
+
+ doAfterClear(regionEvent);
+ } finally {
+ partitionedRegion.getDataStore().unLockBucketCreationForRegionClear();
+ }
+ } else {
+ // Non data-store with client queue and listener
+ doAfterClear(regionEvent);
+ }
+ }
+ }
+
+ private void doAfterClear(RegionEventImpl regionEvent) {
+ if (partitionedRegion.hasAnyClientsInterested()) {
+ notifyClients(regionEvent);
+ }
+
+ if (partitionedRegion.hasListener()) {
+ partitionedRegion.dispatchListenerEvent(EnumListenerEvent.AFTER_REGION_CLEAR, regionEvent);
+ }
+ }
+
+ void notifyClients(RegionEventImpl event) {
+ // Set client routing information into the event
+ // The clear operation in case of PR is distributed differently
+ // hence the FilterRoutingInfo is set here instead of
+ // DistributedCacheOperation.distribute().
+ event.setEventType(EnumListenerEvent.AFTER_REGION_CLEAR);
+ if (!partitionedRegion.isUsedForMetaRegion() && !partitionedRegion
+ .isUsedForPartitionedRegionAdmin()
+ && !partitionedRegion.isUsedForPartitionedRegionBucket() && !partitionedRegion
+ .isUsedForParallelGatewaySenderQueue()) {
+
+ FilterRoutingInfo localCqFrInfo =
+ partitionedRegion.getFilterProfile().getFilterRoutingInfoPart1(event,
+ FilterProfile.NO_PROFILES, Collections.emptySet());
+
+ FilterRoutingInfo localCqInterestFrInfo =
+ partitionedRegion.getFilterProfile().getFilterRoutingInfoPart2(localCqFrInfo, event);
+
+ if (localCqInterestFrInfo != null) {
+ event.setLocalFilterInfo(localCqInterestFrInfo.getLocalFilterInfo());
+ }
+ }
+ partitionedRegion.notifyBridgeClients(event);
+ }
+
+ protected void obtainClearLockLocal(InternalDistributedMember requester) {
+ synchronized (lockForListenerAndClientNotification) {
+ // Check if the member is still part of the distributed system
+ if (!partitionedRegion.getDistributionManager().isCurrentMember(requester)) {
+ return;
+ }
+
+ lockForListenerAndClientNotification.setLocked(requester);
+ if (partitionedRegion.getDataStore() != null) {
+ for (BucketRegion localPrimaryBucketRegion : partitionedRegion.getDataStore()
+ .getAllLocalPrimaryBucketRegions()) {
+ try {
+ localPrimaryBucketRegion.lockLocallyForClear(partitionedRegion.getDistributionManager(),
+ partitionedRegion.getMyId(), null);
+ } catch (Exception ex) {
+ partitionedRegion.checkClosed();
+ }
+ }
+ }
+ }
+ }
+
+ protected void releaseClearLockLocal() {
+ synchronized (lockForListenerAndClientNotification) {
+ if (lockForListenerAndClientNotification.getLockRequester() == null) {
+ // The member has been left.
+ return;
+ }
+ try {
+ if (partitionedRegion.getDataStore() != null) {
+
+ for (BucketRegion localPrimaryBucketRegion : partitionedRegion.getDataStore()
+ .getAllLocalPrimaryBucketRegions()) {
+ try {
+ localPrimaryBucketRegion.releaseLockLocallyForClear(null);
+ } catch (Exception ex) {
+ logger.debug(
+ "Unable to acquire clear lock for bucket region " + localPrimaryBucketRegion
+ .getName(),
+ ex.getMessage());
+ partitionedRegion.checkClosed();
+ }
+ }
+ }
+ } finally {
+ lockForListenerAndClientNotification.setUnLocked();
+ }
+ }
+ }
+
+ private void sendClearRegionMessage(RegionEventImpl event,
+ ClearPartitionedRegionMessage.OperationType op) {
+ RegionEventImpl eventForLocalClear = (RegionEventImpl) event.clone();
+ eventForLocalClear.setOperation(Operation.REGION_LOCAL_CLEAR);
+
+ boolean retry = true;
+ while (retry) {
+ retry = attemptToSendClearRegionMessage(event, op);
+ }
+ }
+
+ private boolean attemptToSendClearRegionMessage(RegionEventImpl event,
+ ClearPartitionedRegionMessage.OperationType op) {
+ if (partitionedRegion.getPRRoot() == null) {
+ if (logger.isDebugEnabled()) {
+ logger.debug(
+ "Partition region {} failed to initialize. Remove its profile from remote members.",
+ this);
+ }
+ new UpdateAttributesProcessor(partitionedRegion, true).distribute(false);
+ return false;
+ }
+ final HashSet configRecipients =
+ new HashSet(partitionedRegion.getRegionAdvisor().adviseAllPRNodes());
+
+ // It's possible this instance has not been initialized
+ // or hasn't gotten through initialize() far enough to have
+ // sent a CreateRegionProcessor message, bug 36048
+ try {
+ final PartitionRegionConfig prConfig =
+ partitionedRegion.getPRRoot().get(partitionedRegion.getRegionIdentifier());
+
+ if (prConfig != null) {
+ // Fix for bug#34621 by Tushar
Review comment:
This comment should probably be removed.
##########
File path: geode-core/src/main/java/org/apache/geode/internal/cache/ClearPartitionedRegion.java
##########
@@ -0,0 +1,379 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.geode.internal.cache;
+
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Iterator;
+
+import org.apache.logging.log4j.Logger;
+
+import org.apache.geode.CancelException;
+import org.apache.geode.cache.Operation;
+import org.apache.geode.cache.partition.PartitionRegionHelper;
+import org.apache.geode.distributed.internal.DistributionManager;
+import org.apache.geode.distributed.internal.MembershipListener;
+import org.apache.geode.distributed.internal.ReplyException;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.cache.versions.RegionVersionVector;
+import org.apache.geode.logging.internal.log4j.api.LogService;
+
+public class ClearPartitionedRegion {
+
+ private static final Logger logger = LogService.getLogger();
+
+ private final PartitionedRegion partitionedRegion;
+
+ private LockForListenerAndClientNotification lockForListenerAndClientNotification =
+ new LockForListenerAndClientNotification();
+
+ private volatile boolean membershipchange = false;
+
+ public ClearPartitionedRegion(PartitionedRegion partitionedRegion) {
+ this.partitionedRegion = partitionedRegion;
+ partitionedRegion.getDistributionManager()
+ .addMembershipListener(new ClearPartitionedRegionListener());
+ }
+
+ public boolean isLockedForListenerAndClientNotification() {
+ return lockForListenerAndClientNotification.isLocked();
+ }
+
+ void acquireDistributedClearLock(String clearLock) {
+ try {
+ partitionedRegion.getPartitionedRegionLockService().lock(clearLock, -1, -1);
+ } catch (IllegalStateException e) {
+ partitionedRegion.lockCheckReadiness();
+ throw e;
+ }
+ }
+
+ void releaseDistributedClearLock(String clearLock) {
+ try {
+ partitionedRegion.getPartitionedRegionLockService().unlock(clearLock);
+ } catch (IllegalStateException e) {
+ partitionedRegion.lockCheckReadiness();
+ } catch (Exception ex) {
+ logger.warn("Caught exception while unlocking clear distributed lock", ex.getMessage());
+ }
+ }
+
+ void obtainLockForClear(RegionEventImpl event) {
+ sendClearRegionMessage(event,
+ ClearPartitionedRegionMessage.OperationType.OP_LOCK_FOR_PR_CLEAR);
+ obtainClearLockLocal(partitionedRegion.getDistributionManager().getId());
+ }
+
+ void releaseLockForClear(RegionEventImpl event) {
+ sendClearRegionMessage(event,
+ ClearPartitionedRegionMessage.OperationType.OP_UNLOCK_FOR_PR_CLEAR);
+ releaseClearLockLocal();
+ }
+
+ void clearRegion(RegionEventImpl regionEvent, boolean cacheWrite,
+ RegionVersionVector vector) {
+ clearRegionLocal(regionEvent, cacheWrite, null);
+ sendClearRegionMessage(regionEvent,
+ ClearPartitionedRegionMessage.OperationType.OP_PR_CLEAR);
+ }
+
+ private void waitForPrimary() {
+ boolean retry;
+ int retryTime = 2 * 60 * 1000 /* partitionedRegion.getRetryTimeout() */;
Review comment:
This timeout should probably not be hard-coded.
##########
File path: geode-core/src/main/java/org/apache/geode/internal/cache/ClearPartitionedRegion.java
##########
@@ -0,0 +1,379 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.geode.internal.cache;
+
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Iterator;
+
+import org.apache.logging.log4j.Logger;
+
+import org.apache.geode.CancelException;
+import org.apache.geode.cache.Operation;
+import org.apache.geode.cache.partition.PartitionRegionHelper;
+import org.apache.geode.distributed.internal.DistributionManager;
+import org.apache.geode.distributed.internal.MembershipListener;
+import org.apache.geode.distributed.internal.ReplyException;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.cache.versions.RegionVersionVector;
+import org.apache.geode.logging.internal.log4j.api.LogService;
+
+public class ClearPartitionedRegion {
+
+ private static final Logger logger = LogService.getLogger();
+
+ private final PartitionedRegion partitionedRegion;
+
+ private LockForListenerAndClientNotification lockForListenerAndClientNotification =
+ new LockForListenerAndClientNotification();
+
+ private volatile boolean membershipchange = false;
+
+ public ClearPartitionedRegion(PartitionedRegion partitionedRegion) {
+ this.partitionedRegion = partitionedRegion;
+ partitionedRegion.getDistributionManager()
+ .addMembershipListener(new ClearPartitionedRegionListener());
+ }
+
+ public boolean isLockedForListenerAndClientNotification() {
+ return lockForListenerAndClientNotification.isLocked();
+ }
+
+ void acquireDistributedClearLock(String clearLock) {
+ try {
+ partitionedRegion.getPartitionedRegionLockService().lock(clearLock, -1, -1);
+ } catch (IllegalStateException e) {
+ partitionedRegion.lockCheckReadiness();
+ throw e;
+ }
+ }
+
+ void releaseDistributedClearLock(String clearLock) {
+ try {
+ partitionedRegion.getPartitionedRegionLockService().unlock(clearLock);
+ } catch (IllegalStateException e) {
+ partitionedRegion.lockCheckReadiness();
+ } catch (Exception ex) {
+ logger.warn("Caught exception while unlocking clear distributed lock", ex.getMessage());
+ }
+ }
+
+ void obtainLockForClear(RegionEventImpl event) {
+ sendClearRegionMessage(event,
+ ClearPartitionedRegionMessage.OperationType.OP_LOCK_FOR_PR_CLEAR);
+ obtainClearLockLocal(partitionedRegion.getDistributionManager().getId());
+ }
+
+ void releaseLockForClear(RegionEventImpl event) {
+ sendClearRegionMessage(event,
+ ClearPartitionedRegionMessage.OperationType.OP_UNLOCK_FOR_PR_CLEAR);
+ releaseClearLockLocal();
+ }
+
+ void clearRegion(RegionEventImpl regionEvent, boolean cacheWrite,
+ RegionVersionVector vector) {
+ clearRegionLocal(regionEvent, cacheWrite, null);
+ sendClearRegionMessage(regionEvent,
+ ClearPartitionedRegionMessage.OperationType.OP_PR_CLEAR);
+ }
+
+ private void waitForPrimary() {
+ boolean retry;
+ int retryTime = 2 * 60 * 1000 /* partitionedRegion.getRetryTimeout() */;
+ PartitionedRegion.RetryTimeKeeper retryTimer = new PartitionedRegion.RetryTimeKeeper(retryTime);
+ do {
+ retry = false;
+ for (BucketRegion bucketRegion : partitionedRegion.getDataStore()
+ .getAllLocalBucketRegions()) {
+ if (!bucketRegion.getBucketAdvisor().hasPrimary()) {
+ if (retryTimer.overMaximum()) {
+ PRHARedundancyProvider.timedOut(partitionedRegion, null, null,
+ "do clear. Missing primary bucket",
+ retryTime);
+ }
+ retryTimer.waitForBucketsRecovery();
+ retry = true;
+ }
+ }
+ } while (retry);
+ }
+
+ public void clearRegionLocal(RegionEventImpl regionEvent, boolean cacheWrite,
+ RegionVersionVector vector) {
+ // Synchronized to handle the requester departure.
+ synchronized (lockForListenerAndClientNotification) {
+ if (partitionedRegion.getDataStore() != null) {
+ partitionedRegion.getDataStore().lockBucketCreationForRegionClear();
+ try {
+ boolean retry;
+ do {
+ retry = false;
+ for (BucketRegion localPrimaryBucketRegion : partitionedRegion.getDataStore()
+ .getAllLocalPrimaryBucketRegions()) {
+ if (localPrimaryBucketRegion.size() > 0) {
+ localPrimaryBucketRegion.clear();
+ }
+ }
+ if (membershipchange) {
+ membershipchange = false;
+ retry = true;
+ waitForPrimary();
Review comment:
It seems possible that we could end up calling `waitForPrimary()` more than once over the course of a clear operation. Given that, might it be a good idea to move the tracking of the timeout to this method rather than the `waitForPrimary()` method? Otherwise we might not go past the timeout in each individual `waitForPrimary()` call but still timeout on the clear operation as a whole.
##########
File path: geode-core/src/main/java/org/apache/geode/internal/cache/BucketRegion.java
##########
@@ -575,16 +575,23 @@ public void cmnClearRegion(RegionEventImpl regionEvent, boolean cacheWrite, bool
// get rvvLock
Set<InternalDistributedMember> participants =
getCacheDistributionAdvisor().adviseInvalidateRegion();
+ boolean isLockedAlready = this.partitionedRegion.getClearPartitionedRegion()
+ .isLockedForListenerAndClientNotification();
+
try {
- obtainWriteLocksForClear(regionEvent, participants);
+ if (!isLockedAlready) {
+ obtainWriteLocksForClear(regionEvent, participants);
+ }
Review comment:
There might exist a small race condition here that the value of `isLockedAlready` changes between the call to `isLockedForListenerAndClientNotification()` and the call to `obtainWriteLocksForClear()`. Is this something that can actually happen? What will happen if `isLockedAlready` is initially false, but before we can call `obtainWriteLocksForClear()`, the actual value becomes true?
##########
File path: geode-core/src/main/java/org/apache/geode/internal/cache/ClearPartitionedRegion.java
##########
@@ -0,0 +1,379 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.geode.internal.cache;
+
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Iterator;
+
+import org.apache.logging.log4j.Logger;
+
+import org.apache.geode.CancelException;
+import org.apache.geode.cache.Operation;
+import org.apache.geode.cache.partition.PartitionRegionHelper;
+import org.apache.geode.distributed.internal.DistributionManager;
+import org.apache.geode.distributed.internal.MembershipListener;
+import org.apache.geode.distributed.internal.ReplyException;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.cache.versions.RegionVersionVector;
+import org.apache.geode.logging.internal.log4j.api.LogService;
+
+public class ClearPartitionedRegion {
+
+ private static final Logger logger = LogService.getLogger();
+
+ private final PartitionedRegion partitionedRegion;
+
+ private LockForListenerAndClientNotification lockForListenerAndClientNotification =
+ new LockForListenerAndClientNotification();
+
+ private volatile boolean membershipchange = false;
+
+ public ClearPartitionedRegion(PartitionedRegion partitionedRegion) {
+ this.partitionedRegion = partitionedRegion;
+ partitionedRegion.getDistributionManager()
+ .addMembershipListener(new ClearPartitionedRegionListener());
+ }
+
+ public boolean isLockedForListenerAndClientNotification() {
+ return lockForListenerAndClientNotification.isLocked();
+ }
+
+ void acquireDistributedClearLock(String clearLock) {
+ try {
+ partitionedRegion.getPartitionedRegionLockService().lock(clearLock, -1, -1);
+ } catch (IllegalStateException e) {
+ partitionedRegion.lockCheckReadiness();
+ throw e;
+ }
+ }
+
+ void releaseDistributedClearLock(String clearLock) {
+ try {
+ partitionedRegion.getPartitionedRegionLockService().unlock(clearLock);
+ } catch (IllegalStateException e) {
+ partitionedRegion.lockCheckReadiness();
+ } catch (Exception ex) {
+ logger.warn("Caught exception while unlocking clear distributed lock", ex.getMessage());
+ }
+ }
+
+ void obtainLockForClear(RegionEventImpl event) {
+ sendClearRegionMessage(event,
+ ClearPartitionedRegionMessage.OperationType.OP_LOCK_FOR_PR_CLEAR);
+ obtainClearLockLocal(partitionedRegion.getDistributionManager().getId());
+ }
+
+ void releaseLockForClear(RegionEventImpl event) {
+ sendClearRegionMessage(event,
+ ClearPartitionedRegionMessage.OperationType.OP_UNLOCK_FOR_PR_CLEAR);
+ releaseClearLockLocal();
+ }
+
+ void clearRegion(RegionEventImpl regionEvent, boolean cacheWrite,
+ RegionVersionVector vector) {
+ clearRegionLocal(regionEvent, cacheWrite, null);
+ sendClearRegionMessage(regionEvent,
+ ClearPartitionedRegionMessage.OperationType.OP_PR_CLEAR);
+ }
+
+ private void waitForPrimary() {
+ boolean retry;
+ int retryTime = 2 * 60 * 1000 /* partitionedRegion.getRetryTimeout() */;
+ PartitionedRegion.RetryTimeKeeper retryTimer = new PartitionedRegion.RetryTimeKeeper(retryTime);
+ do {
+ retry = false;
+ for (BucketRegion bucketRegion : partitionedRegion.getDataStore()
+ .getAllLocalBucketRegions()) {
+ if (!bucketRegion.getBucketAdvisor().hasPrimary()) {
+ if (retryTimer.overMaximum()) {
+ PRHARedundancyProvider.timedOut(partitionedRegion, null, null,
+ "do clear. Missing primary bucket",
+ retryTime);
+ }
+ retryTimer.waitForBucketsRecovery();
+ retry = true;
+ }
+ }
+ } while (retry);
+ }
+
+ public void clearRegionLocal(RegionEventImpl regionEvent, boolean cacheWrite,
+ RegionVersionVector vector) {
+ // Synchronized to handle the requester departure.
+ synchronized (lockForListenerAndClientNotification) {
+ if (partitionedRegion.getDataStore() != null) {
+ partitionedRegion.getDataStore().lockBucketCreationForRegionClear();
+ try {
+ boolean retry;
+ do {
+ retry = false;
+ for (BucketRegion localPrimaryBucketRegion : partitionedRegion.getDataStore()
+ .getAllLocalPrimaryBucketRegions()) {
+ if (localPrimaryBucketRegion.size() > 0) {
+ localPrimaryBucketRegion.clear();
+ }
+ }
+ if (membershipchange) {
+ membershipchange = false;
+ retry = true;
+ waitForPrimary();
+ }
+ } while (retry);
+
+ doAfterClear(regionEvent);
+ } finally {
+ partitionedRegion.getDataStore().unLockBucketCreationForRegionClear();
+ }
+ } else {
+ // Non data-store with client queue and listener
+ doAfterClear(regionEvent);
+ }
+ }
+ }
+
+ private void doAfterClear(RegionEventImpl regionEvent) {
+ if (partitionedRegion.hasAnyClientsInterested()) {
+ notifyClients(regionEvent);
+ }
+
+ if (partitionedRegion.hasListener()) {
+ partitionedRegion.dispatchListenerEvent(EnumListenerEvent.AFTER_REGION_CLEAR, regionEvent);
+ }
+ }
+
+ void notifyClients(RegionEventImpl event) {
+ // Set client routing information into the event
+ // The clear operation in case of PR is distributed differently
+ // hence the FilterRoutingInfo is set here instead of
+ // DistributedCacheOperation.distribute().
+ event.setEventType(EnumListenerEvent.AFTER_REGION_CLEAR);
+ if (!partitionedRegion.isUsedForMetaRegion() && !partitionedRegion
+ .isUsedForPartitionedRegionAdmin()
+ && !partitionedRegion.isUsedForPartitionedRegionBucket() && !partitionedRegion
+ .isUsedForParallelGatewaySenderQueue()) {
+
+ FilterRoutingInfo localCqFrInfo =
+ partitionedRegion.getFilterProfile().getFilterRoutingInfoPart1(event,
+ FilterProfile.NO_PROFILES, Collections.emptySet());
+
+ FilterRoutingInfo localCqInterestFrInfo =
+ partitionedRegion.getFilterProfile().getFilterRoutingInfoPart2(localCqFrInfo, event);
+
+ if (localCqInterestFrInfo != null) {
+ event.setLocalFilterInfo(localCqInterestFrInfo.getLocalFilterInfo());
+ }
+ }
+ partitionedRegion.notifyBridgeClients(event);
+ }
+
+ protected void obtainClearLockLocal(InternalDistributedMember requester) {
+ synchronized (lockForListenerAndClientNotification) {
+ // Check if the member is still part of the distributed system
+ if (!partitionedRegion.getDistributionManager().isCurrentMember(requester)) {
+ return;
+ }
+
+ lockForListenerAndClientNotification.setLocked(requester);
+ if (partitionedRegion.getDataStore() != null) {
+ for (BucketRegion localPrimaryBucketRegion : partitionedRegion.getDataStore()
+ .getAllLocalPrimaryBucketRegions()) {
+ try {
+ localPrimaryBucketRegion.lockLocallyForClear(partitionedRegion.getDistributionManager(),
+ partitionedRegion.getMyId(), null);
+ } catch (Exception ex) {
+ partitionedRegion.checkClosed();
+ }
+ }
+ }
+ }
+ }
+
+ protected void releaseClearLockLocal() {
+ synchronized (lockForListenerAndClientNotification) {
+ if (lockForListenerAndClientNotification.getLockRequester() == null) {
+ // The member has been left.
+ return;
+ }
+ try {
+ if (partitionedRegion.getDataStore() != null) {
+
+ for (BucketRegion localPrimaryBucketRegion : partitionedRegion.getDataStore()
+ .getAllLocalPrimaryBucketRegions()) {
+ try {
+ localPrimaryBucketRegion.releaseLockLocallyForClear(null);
+ } catch (Exception ex) {
+ logger.debug(
+ "Unable to acquire clear lock for bucket region " + localPrimaryBucketRegion
+ .getName(),
+ ex.getMessage());
+ partitionedRegion.checkClosed();
+ }
+ }
+ }
+ } finally {
+ lockForListenerAndClientNotification.setUnLocked();
+ }
+ }
+ }
+
+ private void sendClearRegionMessage(RegionEventImpl event,
+ ClearPartitionedRegionMessage.OperationType op) {
+ RegionEventImpl eventForLocalClear = (RegionEventImpl) event.clone();
+ eventForLocalClear.setOperation(Operation.REGION_LOCAL_CLEAR);
+
+ boolean retry = true;
+ while (retry) {
+ retry = attemptToSendClearRegionMessage(event, op);
+ }
+ }
+
+ private boolean attemptToSendClearRegionMessage(RegionEventImpl event,
+ ClearPartitionedRegionMessage.OperationType op) {
+ if (partitionedRegion.getPRRoot() == null) {
+ if (logger.isDebugEnabled()) {
+ logger.debug(
+ "Partition region {} failed to initialize. Remove its profile from remote members.",
+ this);
Review comment:
For this log output, the `this` should probably be replaced with `partitionedRegion`.
##########
File path: geode-core/src/main/java/org/apache/geode/internal/cache/ClearPartitionedRegionMessage.java
##########
@@ -0,0 +1,176 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+package org.apache.geode.internal.cache;
+
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+import java.util.Set;
+
+import org.apache.logging.log4j.Logger;
+
+import org.apache.geode.DataSerializer;
+import org.apache.geode.cache.CacheException;
+import org.apache.geode.cache.Operation;
+import org.apache.geode.distributed.internal.ClusterDistributionManager;
+import org.apache.geode.distributed.internal.DistributionManager;
+import org.apache.geode.distributed.internal.InternalDistributedSystem;
+import org.apache.geode.distributed.internal.ReplyProcessor21;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.Assert;
+import org.apache.geode.internal.cache.partitioned.PartitionMessage;
+import org.apache.geode.internal.serialization.DeserializationContext;
+import org.apache.geode.internal.serialization.SerializationContext;
+import org.apache.geode.logging.internal.log4j.api.LogService;
+
+public class ClearPartitionedRegionMessage extends PartitionMessage {
+ private static final Logger logger = LogService.getLogger();
+
+ public static enum OperationType {
Review comment:
The `static` here is not necessary.
##########
File path: geode-core/src/main/java/org/apache/geode/internal/cache/ClearPartitionedRegionMessage.java
##########
@@ -0,0 +1,176 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+package org.apache.geode.internal.cache;
+
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+import java.util.Set;
+
+import org.apache.logging.log4j.Logger;
+
+import org.apache.geode.DataSerializer;
+import org.apache.geode.cache.CacheException;
+import org.apache.geode.cache.Operation;
+import org.apache.geode.distributed.internal.ClusterDistributionManager;
+import org.apache.geode.distributed.internal.DistributionManager;
+import org.apache.geode.distributed.internal.InternalDistributedSystem;
+import org.apache.geode.distributed.internal.ReplyProcessor21;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.Assert;
+import org.apache.geode.internal.cache.partitioned.PartitionMessage;
+import org.apache.geode.internal.serialization.DeserializationContext;
+import org.apache.geode.internal.serialization.SerializationContext;
+import org.apache.geode.logging.internal.log4j.api.LogService;
+
+public class ClearPartitionedRegionMessage extends PartitionMessage {
+ private static final Logger logger = LogService.getLogger();
+
+ public static enum OperationType {
+ OP_LOCK_FOR_PR_CLEAR, OP_UNLOCK_FOR_PR_CLEAR, OP_PR_CLEAR,
+ }
+
+ private Object cbArg;
+
+ private OperationType op;
+
+ private EventID eventID;
+
+ private PartitionedRegion partitionedRegion;
+
+ private Set<InternalDistributedMember> recipients;
+
+ @Override
+ public EventID getEventID() {
+ return eventID;
+ }
+
+ public ClearPartitionedRegionMessage() {}
+
+ ClearPartitionedRegionMessage(Set recipients, PartitionedRegion region,
+ ReplyProcessor21 processor, ClearPartitionedRegionMessage.OperationType operationType,
+ final RegionEventImpl event) {
+ super(recipients, region.getPRId(), processor);
+ this.recipients = recipients;
+ partitionedRegion = region;
+ op = operationType;
+ cbArg = event.getRawCallbackArgument();
+ eventID = event.getEventId();
+ }
+
+ public OperationType getOp() {
+ return op;
+ }
+
+ public void send() {
+ Assert.assertTrue(recipients != null, "ClearMessage NULL recipients set");
+ setTransactionDistributed(partitionedRegion.getCache().getTxManager().isDistributed());
+ partitionedRegion.getDistributionManager().putOutgoing(this);
+ }
+
+ @Override
+ protected Throwable processCheckForPR(PartitionedRegion pr,
+ DistributionManager distributionManager) {
+ if (pr != null && !pr.getDistributionAdvisor().isInitialized()) {
+ Throwable thr = new ForceReattemptException(
+ String.format("%s : could not find partitioned region with Id %s",
+ distributionManager.getDistributionManagerId(),
+ pr.getRegionIdentifier()));
+ return thr;
+ }
+ return null;
+ }
+
+
+ @Override
+ protected boolean operateOnPartitionedRegion(ClusterDistributionManager dm, PartitionedRegion r,
+ long startTime) throws CacheException {
+
+ if (r == null) {
+ return true;
+ }
+
+ if (r.isDestroyed()) {
+ return true;
+ }
+
+ if (op == OperationType.OP_LOCK_FOR_PR_CLEAR) {
+ r.getClearPartitionedRegion().obtainClearLockLocal(getSender());
+ } else if (op == OperationType.OP_UNLOCK_FOR_PR_CLEAR) {
+ r.getClearPartitionedRegion().releaseClearLockLocal();
+ } else {
+ RegionEventImpl event =
+ new RegionEventImpl(r, Operation.REGION_CLEAR, this.cbArg, true, r.getMyId(),
+ getEventID());
+ r.getClearPartitionedRegion().clearRegionLocal(event, false, null);
+ }
+ return true;
+ }
+
+ @Override
+ protected void appendFields(StringBuilder buff) {
+ super.appendFields(buff);
+ buff.append("; cbArg=").append(this.cbArg).append("; op=").append(this.op);
+ }
+
+ @Override
+ public int getDSFID() {
+ return CLEAR_PARTITIONED_REGION_MESSAGE;
+ }
+
+ @Override
+ public void fromData(DataInput in,
+ DeserializationContext context) throws IOException, ClassNotFoundException {
+ super.fromData(in, context);
+ this.cbArg = DataSerializer.readObject(in);
+ op = ClearPartitionedRegionMessage.OperationType.values()[in.readByte()];
+ eventID = DataSerializer.readObject(in);
+ }
+
+ @Override
+ public void toData(DataOutput out,
+ SerializationContext context) throws IOException {
+ super.toData(out, context);
+ DataSerializer.writeObject(this.cbArg, out);
+ out.writeByte(op.ordinal());
+ DataSerializer.writeObject(eventID, out);
+ }
+
+ /**
+ * The response on which to wait for all the replies. This response ignores any exceptions
+ * received from the "far side"
+ *
+ * @since GemFire 5.0
Review comment:
This line should be removed, or updated.
##########
File path: geode-core/src/main/java/org/apache/geode/internal/cache/ClearPartitionedRegionMessage.java
##########
@@ -0,0 +1,176 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+package org.apache.geode.internal.cache;
+
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+import java.util.Set;
+
+import org.apache.logging.log4j.Logger;
+
+import org.apache.geode.DataSerializer;
+import org.apache.geode.cache.CacheException;
+import org.apache.geode.cache.Operation;
+import org.apache.geode.distributed.internal.ClusterDistributionManager;
+import org.apache.geode.distributed.internal.DistributionManager;
+import org.apache.geode.distributed.internal.InternalDistributedSystem;
+import org.apache.geode.distributed.internal.ReplyProcessor21;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.Assert;
+import org.apache.geode.internal.cache.partitioned.PartitionMessage;
+import org.apache.geode.internal.serialization.DeserializationContext;
+import org.apache.geode.internal.serialization.SerializationContext;
+import org.apache.geode.logging.internal.log4j.api.LogService;
+
+public class ClearPartitionedRegionMessage extends PartitionMessage {
+ private static final Logger logger = LogService.getLogger();
Review comment:
This logger is never used in this class.
##########
File path: geode-core/src/main/java/org/apache/geode/internal/cache/ClearPartitionedRegion.java
##########
@@ -0,0 +1,379 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.geode.internal.cache;
+
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Iterator;
+
+import org.apache.logging.log4j.Logger;
+
+import org.apache.geode.CancelException;
+import org.apache.geode.cache.Operation;
+import org.apache.geode.cache.partition.PartitionRegionHelper;
+import org.apache.geode.distributed.internal.DistributionManager;
+import org.apache.geode.distributed.internal.MembershipListener;
+import org.apache.geode.distributed.internal.ReplyException;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.cache.versions.RegionVersionVector;
+import org.apache.geode.logging.internal.log4j.api.LogService;
+
+public class ClearPartitionedRegion {
+
+ private static final Logger logger = LogService.getLogger();
+
+ private final PartitionedRegion partitionedRegion;
+
+ private LockForListenerAndClientNotification lockForListenerAndClientNotification =
+ new LockForListenerAndClientNotification();
+
+ private volatile boolean membershipchange = false;
+
+ public ClearPartitionedRegion(PartitionedRegion partitionedRegion) {
+ this.partitionedRegion = partitionedRegion;
+ partitionedRegion.getDistributionManager()
+ .addMembershipListener(new ClearPartitionedRegionListener());
+ }
+
+ public boolean isLockedForListenerAndClientNotification() {
+ return lockForListenerAndClientNotification.isLocked();
+ }
+
+ void acquireDistributedClearLock(String clearLock) {
+ try {
+ partitionedRegion.getPartitionedRegionLockService().lock(clearLock, -1, -1);
+ } catch (IllegalStateException e) {
+ partitionedRegion.lockCheckReadiness();
+ throw e;
+ }
+ }
+
+ void releaseDistributedClearLock(String clearLock) {
+ try {
+ partitionedRegion.getPartitionedRegionLockService().unlock(clearLock);
+ } catch (IllegalStateException e) {
+ partitionedRegion.lockCheckReadiness();
+ } catch (Exception ex) {
+ logger.warn("Caught exception while unlocking clear distributed lock", ex.getMessage());
+ }
+ }
+
+ void obtainLockForClear(RegionEventImpl event) {
+ sendClearRegionMessage(event,
+ ClearPartitionedRegionMessage.OperationType.OP_LOCK_FOR_PR_CLEAR);
+ obtainClearLockLocal(partitionedRegion.getDistributionManager().getId());
+ }
+
+ void releaseLockForClear(RegionEventImpl event) {
+ sendClearRegionMessage(event,
+ ClearPartitionedRegionMessage.OperationType.OP_UNLOCK_FOR_PR_CLEAR);
+ releaseClearLockLocal();
+ }
+
+ void clearRegion(RegionEventImpl regionEvent, boolean cacheWrite,
+ RegionVersionVector vector) {
+ clearRegionLocal(regionEvent, cacheWrite, null);
+ sendClearRegionMessage(regionEvent,
+ ClearPartitionedRegionMessage.OperationType.OP_PR_CLEAR);
+ }
+
+ private void waitForPrimary() {
+ boolean retry;
+ int retryTime = 2 * 60 * 1000 /* partitionedRegion.getRetryTimeout() */;
+ PartitionedRegion.RetryTimeKeeper retryTimer = new PartitionedRegion.RetryTimeKeeper(retryTime);
+ do {
+ retry = false;
+ for (BucketRegion bucketRegion : partitionedRegion.getDataStore()
+ .getAllLocalBucketRegions()) {
+ if (!bucketRegion.getBucketAdvisor().hasPrimary()) {
+ if (retryTimer.overMaximum()) {
+ PRHARedundancyProvider.timedOut(partitionedRegion, null, null,
+ "do clear. Missing primary bucket",
+ retryTime);
+ }
+ retryTimer.waitForBucketsRecovery();
+ retry = true;
+ }
+ }
+ } while (retry);
+ }
+
+ public void clearRegionLocal(RegionEventImpl regionEvent, boolean cacheWrite,
+ RegionVersionVector vector) {
+ // Synchronized to handle the requester departure.
+ synchronized (lockForListenerAndClientNotification) {
+ if (partitionedRegion.getDataStore() != null) {
+ partitionedRegion.getDataStore().lockBucketCreationForRegionClear();
+ try {
+ boolean retry;
+ do {
+ retry = false;
+ for (BucketRegion localPrimaryBucketRegion : partitionedRegion.getDataStore()
+ .getAllLocalPrimaryBucketRegions()) {
+ if (localPrimaryBucketRegion.size() > 0) {
+ localPrimaryBucketRegion.clear();
+ }
+ }
+ if (membershipchange) {
+ membershipchange = false;
+ retry = true;
+ waitForPrimary();
+ }
+ } while (retry);
+
+ doAfterClear(regionEvent);
+ } finally {
+ partitionedRegion.getDataStore().unLockBucketCreationForRegionClear();
+ }
+ } else {
+ // Non data-store with client queue and listener
+ doAfterClear(regionEvent);
+ }
+ }
+ }
+
+ private void doAfterClear(RegionEventImpl regionEvent) {
+ if (partitionedRegion.hasAnyClientsInterested()) {
+ notifyClients(regionEvent);
+ }
+
+ if (partitionedRegion.hasListener()) {
+ partitionedRegion.dispatchListenerEvent(EnumListenerEvent.AFTER_REGION_CLEAR, regionEvent);
+ }
+ }
+
+ void notifyClients(RegionEventImpl event) {
+ // Set client routing information into the event
+ // The clear operation in case of PR is distributed differently
+ // hence the FilterRoutingInfo is set here instead of
+ // DistributedCacheOperation.distribute().
+ event.setEventType(EnumListenerEvent.AFTER_REGION_CLEAR);
+ if (!partitionedRegion.isUsedForMetaRegion() && !partitionedRegion
+ .isUsedForPartitionedRegionAdmin()
+ && !partitionedRegion.isUsedForPartitionedRegionBucket() && !partitionedRegion
+ .isUsedForParallelGatewaySenderQueue()) {
+
+ FilterRoutingInfo localCqFrInfo =
+ partitionedRegion.getFilterProfile().getFilterRoutingInfoPart1(event,
+ FilterProfile.NO_PROFILES, Collections.emptySet());
+
+ FilterRoutingInfo localCqInterestFrInfo =
+ partitionedRegion.getFilterProfile().getFilterRoutingInfoPart2(localCqFrInfo, event);
+
+ if (localCqInterestFrInfo != null) {
+ event.setLocalFilterInfo(localCqInterestFrInfo.getLocalFilterInfo());
+ }
+ }
+ partitionedRegion.notifyBridgeClients(event);
+ }
+
+ protected void obtainClearLockLocal(InternalDistributedMember requester) {
+ synchronized (lockForListenerAndClientNotification) {
+ // Check if the member is still part of the distributed system
+ if (!partitionedRegion.getDistributionManager().isCurrentMember(requester)) {
+ return;
+ }
+
+ lockForListenerAndClientNotification.setLocked(requester);
+ if (partitionedRegion.getDataStore() != null) {
+ for (BucketRegion localPrimaryBucketRegion : partitionedRegion.getDataStore()
+ .getAllLocalPrimaryBucketRegions()) {
+ try {
+ localPrimaryBucketRegion.lockLocallyForClear(partitionedRegion.getDistributionManager(),
+ partitionedRegion.getMyId(), null);
+ } catch (Exception ex) {
+ partitionedRegion.checkClosed();
+ }
+ }
+ }
+ }
+ }
+
+ protected void releaseClearLockLocal() {
+ synchronized (lockForListenerAndClientNotification) {
+ if (lockForListenerAndClientNotification.getLockRequester() == null) {
+ // The member has been left.
+ return;
+ }
+ try {
+ if (partitionedRegion.getDataStore() != null) {
+
+ for (BucketRegion localPrimaryBucketRegion : partitionedRegion.getDataStore()
+ .getAllLocalPrimaryBucketRegions()) {
+ try {
+ localPrimaryBucketRegion.releaseLockLocallyForClear(null);
+ } catch (Exception ex) {
+ logger.debug(
+ "Unable to acquire clear lock for bucket region " + localPrimaryBucketRegion
+ .getName(),
+ ex.getMessage());
+ partitionedRegion.checkClosed();
+ }
+ }
+ }
+ } finally {
+ lockForListenerAndClientNotification.setUnLocked();
+ }
+ }
+ }
+
+ private void sendClearRegionMessage(RegionEventImpl event,
+ ClearPartitionedRegionMessage.OperationType op) {
+ RegionEventImpl eventForLocalClear = (RegionEventImpl) event.clone();
+ eventForLocalClear.setOperation(Operation.REGION_LOCAL_CLEAR);
+
+ boolean retry = true;
+ while (retry) {
+ retry = attemptToSendClearRegionMessage(event, op);
+ }
+ }
+
+ private boolean attemptToSendClearRegionMessage(RegionEventImpl event,
+ ClearPartitionedRegionMessage.OperationType op) {
+ if (partitionedRegion.getPRRoot() == null) {
+ if (logger.isDebugEnabled()) {
+ logger.debug(
+ "Partition region {} failed to initialize. Remove its profile from remote members.",
+ this);
+ }
+ new UpdateAttributesProcessor(partitionedRegion, true).distribute(false);
+ return false;
+ }
+ final HashSet configRecipients =
+ new HashSet(partitionedRegion.getRegionAdvisor().adviseAllPRNodes());
+
+ // It's possible this instance has not been initialized
+ // or hasn't gotten through initialize() far enough to have
+ // sent a CreateRegionProcessor message, bug 36048
+ try {
+ final PartitionRegionConfig prConfig =
+ partitionedRegion.getPRRoot().get(partitionedRegion.getRegionIdentifier());
+
+ if (prConfig != null) {
+ // Fix for bug#34621 by Tushar
+ Iterator itr = prConfig.getNodes().iterator();
+ while (itr.hasNext()) {
+ InternalDistributedMember idm = ((Node) itr.next()).getMemberId();
+ if (!idm.equals(partitionedRegion.getMyId())) {
+ configRecipients.add(idm);
+ }
+ }
+ }
+ } catch (CancelException ignore) {
+ // ignore
+ }
+
+ try {
+ ClearPartitionedRegionMessage.ClearPartitionedRegionResponse resp =
+ new ClearPartitionedRegionMessage.ClearPartitionedRegionResponse(
+ partitionedRegion.getSystem(),
+ configRecipients);
+ ClearPartitionedRegionMessage clearPartitionedRegionMessage =
+ new ClearPartitionedRegionMessage(configRecipients, partitionedRegion, resp, op, event);
+ clearPartitionedRegionMessage.send();
+
+ resp.waitForRepliesUninterruptibly();
+
+ } catch (ReplyException e) {
+ if (e.getRootCause() instanceof ForceReattemptException) {
+ return true;
+ }
+ logger.warn(
+ "PartitionedRegion#sendClearRegionMessage: Caught exception during ClearRegionMessage send and waiting for response",
+ e);
+ }
+ return false;
+ }
+
+ void doClear(RegionEventImpl regionEvent, boolean cacheWrite,
+ PartitionedRegion partitionedRegion) {
+ String lockName = "_clearOperation" + partitionedRegion.getDisplayName();
Review comment:
The "_clearOperation" String should be extracted to a constant, since it's used in multiple places.
##########
File path: geode-core/src/main/java/org/apache/geode/internal/cache/ClearPartitionedRegion.java
##########
@@ -0,0 +1,379 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.geode.internal.cache;
+
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Iterator;
+
+import org.apache.logging.log4j.Logger;
+
+import org.apache.geode.CancelException;
+import org.apache.geode.cache.Operation;
+import org.apache.geode.cache.partition.PartitionRegionHelper;
+import org.apache.geode.distributed.internal.DistributionManager;
+import org.apache.geode.distributed.internal.MembershipListener;
+import org.apache.geode.distributed.internal.ReplyException;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.cache.versions.RegionVersionVector;
+import org.apache.geode.logging.internal.log4j.api.LogService;
+
+public class ClearPartitionedRegion {
+
+ private static final Logger logger = LogService.getLogger();
+
+ private final PartitionedRegion partitionedRegion;
+
+ private LockForListenerAndClientNotification lockForListenerAndClientNotification =
+ new LockForListenerAndClientNotification();
+
+ private volatile boolean membershipchange = false;
+
+ public ClearPartitionedRegion(PartitionedRegion partitionedRegion) {
+ this.partitionedRegion = partitionedRegion;
+ partitionedRegion.getDistributionManager()
+ .addMembershipListener(new ClearPartitionedRegionListener());
+ }
+
+ public boolean isLockedForListenerAndClientNotification() {
+ return lockForListenerAndClientNotification.isLocked();
+ }
+
+ void acquireDistributedClearLock(String clearLock) {
+ try {
+ partitionedRegion.getPartitionedRegionLockService().lock(clearLock, -1, -1);
+ } catch (IllegalStateException e) {
+ partitionedRegion.lockCheckReadiness();
+ throw e;
+ }
+ }
+
+ void releaseDistributedClearLock(String clearLock) {
+ try {
+ partitionedRegion.getPartitionedRegionLockService().unlock(clearLock);
+ } catch (IllegalStateException e) {
+ partitionedRegion.lockCheckReadiness();
+ } catch (Exception ex) {
+ logger.warn("Caught exception while unlocking clear distributed lock", ex.getMessage());
+ }
+ }
+
+ void obtainLockForClear(RegionEventImpl event) {
+ sendClearRegionMessage(event,
+ ClearPartitionedRegionMessage.OperationType.OP_LOCK_FOR_PR_CLEAR);
+ obtainClearLockLocal(partitionedRegion.getDistributionManager().getId());
+ }
+
+ void releaseLockForClear(RegionEventImpl event) {
+ sendClearRegionMessage(event,
+ ClearPartitionedRegionMessage.OperationType.OP_UNLOCK_FOR_PR_CLEAR);
+ releaseClearLockLocal();
+ }
+
+ void clearRegion(RegionEventImpl regionEvent, boolean cacheWrite,
+ RegionVersionVector vector) {
+ clearRegionLocal(regionEvent, cacheWrite, null);
+ sendClearRegionMessage(regionEvent,
+ ClearPartitionedRegionMessage.OperationType.OP_PR_CLEAR);
+ }
+
+ private void waitForPrimary() {
+ boolean retry;
+ int retryTime = 2 * 60 * 1000 /* partitionedRegion.getRetryTimeout() */;
+ PartitionedRegion.RetryTimeKeeper retryTimer = new PartitionedRegion.RetryTimeKeeper(retryTime);
+ do {
+ retry = false;
+ for (BucketRegion bucketRegion : partitionedRegion.getDataStore()
+ .getAllLocalBucketRegions()) {
+ if (!bucketRegion.getBucketAdvisor().hasPrimary()) {
+ if (retryTimer.overMaximum()) {
+ PRHARedundancyProvider.timedOut(partitionedRegion, null, null,
+ "do clear. Missing primary bucket",
+ retryTime);
+ }
+ retryTimer.waitForBucketsRecovery();
+ retry = true;
+ }
+ }
+ } while (retry);
+ }
+
+ public void clearRegionLocal(RegionEventImpl regionEvent, boolean cacheWrite,
+ RegionVersionVector vector) {
Review comment:
The `cacheWrite` and `vector` arguments are currently not used in this method. Can they be removed from the signature, or will they be used in future?
##########
File path: geode-core/src/main/java/org/apache/geode/internal/cache/ClearPartitionedRegionMessage.java
##########
@@ -0,0 +1,176 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+package org.apache.geode.internal.cache;
+
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+import java.util.Set;
+
+import org.apache.logging.log4j.Logger;
+
+import org.apache.geode.DataSerializer;
+import org.apache.geode.cache.CacheException;
+import org.apache.geode.cache.Operation;
+import org.apache.geode.distributed.internal.ClusterDistributionManager;
+import org.apache.geode.distributed.internal.DistributionManager;
+import org.apache.geode.distributed.internal.InternalDistributedSystem;
+import org.apache.geode.distributed.internal.ReplyProcessor21;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.Assert;
+import org.apache.geode.internal.cache.partitioned.PartitionMessage;
+import org.apache.geode.internal.serialization.DeserializationContext;
+import org.apache.geode.internal.serialization.SerializationContext;
+import org.apache.geode.logging.internal.log4j.api.LogService;
+
+public class ClearPartitionedRegionMessage extends PartitionMessage {
+ private static final Logger logger = LogService.getLogger();
+
+ public static enum OperationType {
+ OP_LOCK_FOR_PR_CLEAR, OP_UNLOCK_FOR_PR_CLEAR, OP_PR_CLEAR,
+ }
+
+ private Object cbArg;
+
+ private OperationType op;
+
+ private EventID eventID;
+
+ private PartitionedRegion partitionedRegion;
+
+ private Set<InternalDistributedMember> recipients;
+
+ @Override
+ public EventID getEventID() {
+ return eventID;
+ }
+
+ public ClearPartitionedRegionMessage() {}
+
+ ClearPartitionedRegionMessage(Set recipients, PartitionedRegion region,
+ ReplyProcessor21 processor, ClearPartitionedRegionMessage.OperationType operationType,
+ final RegionEventImpl event) {
+ super(recipients, region.getPRId(), processor);
+ this.recipients = recipients;
+ partitionedRegion = region;
+ op = operationType;
+ cbArg = event.getRawCallbackArgument();
+ eventID = event.getEventId();
+ }
+
+ public OperationType getOp() {
+ return op;
+ }
+
+ public void send() {
+ Assert.assertTrue(recipients != null, "ClearMessage NULL recipients set");
+ setTransactionDistributed(partitionedRegion.getCache().getTxManager().isDistributed());
+ partitionedRegion.getDistributionManager().putOutgoing(this);
+ }
+
+ @Override
+ protected Throwable processCheckForPR(PartitionedRegion pr,
+ DistributionManager distributionManager) {
+ if (pr != null && !pr.getDistributionAdvisor().isInitialized()) {
+ Throwable thr = new ForceReattemptException(
+ String.format("%s : could not find partitioned region with Id %s",
+ distributionManager.getDistributionManagerId(),
+ pr.getRegionIdentifier()));
+ return thr;
+ }
+ return null;
+ }
+
+
+ @Override
+ protected boolean operateOnPartitionedRegion(ClusterDistributionManager dm, PartitionedRegion r,
+ long startTime) throws CacheException {
+
+ if (r == null) {
+ return true;
+ }
+
+ if (r.isDestroyed()) {
+ return true;
+ }
+
+ if (op == OperationType.OP_LOCK_FOR_PR_CLEAR) {
+ r.getClearPartitionedRegion().obtainClearLockLocal(getSender());
+ } else if (op == OperationType.OP_UNLOCK_FOR_PR_CLEAR) {
+ r.getClearPartitionedRegion().releaseClearLockLocal();
+ } else {
+ RegionEventImpl event =
+ new RegionEventImpl(r, Operation.REGION_CLEAR, this.cbArg, true, r.getMyId(),
+ getEventID());
+ r.getClearPartitionedRegion().clearRegionLocal(event, false, null);
+ }
+ return true;
+ }
+
+ @Override
+ protected void appendFields(StringBuilder buff) {
+ super.appendFields(buff);
+ buff.append("; cbArg=").append(this.cbArg).append("; op=").append(this.op);
Review comment:
For consistency with the format of `ParitionMessage.toString()`, either these strings should not have semicolons, or `PartitionMessage` should be modified to have semicolon-separated output.
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [geode] gesterzhou commented on a change in pull request #4987: GEODE-7678: Support for cache-listener and client-notification for Partitioned Region Clear operation.
Posted by GitBox <gi...@apache.org>.
gesterzhou commented on a change in pull request #4987:
URL: https://github.com/apache/geode/pull/4987#discussion_r419023089
##########
File path: geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegionClear.java
##########
@@ -30,18 +31,22 @@
import org.apache.geode.internal.cache.versions.RegionVersionVector;
import org.apache.geode.logging.internal.log4j.api.LogService;
-public class ClearPartitionedRegion {
+public class PartitionedRegionClear {
private static final Logger logger = LogService.getLogger();
+ private static final String CLEAR_OPERATION = "_clearOperation";
+
+ private final int retryTime = 2 * 60 * 1000 /* partitionedRegion.getRetryTimeout() */;
Review comment:
Our current clear timeout is actually determined by rvv domination timeout, i.e. 5 seconds.
If a clear took more than 5 seconds, that means a rvv domination timeout happened. Something must have been wrong.
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [geode] DonalEvans commented on a change in pull request #4987: GEODE-7678: Support for cache-listener and client-notification for Partitioned Region Clear operation.
Posted by GitBox <gi...@apache.org>.
DonalEvans commented on a change in pull request #4987:
URL: https://github.com/apache/geode/pull/4987#discussion_r418160066
##########
File path: geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegionClear.java
##########
@@ -30,18 +31,22 @@
import org.apache.geode.internal.cache.versions.RegionVersionVector;
import org.apache.geode.logging.internal.log4j.api.LogService;
-public class ClearPartitionedRegion {
+public class PartitionedRegionClear {
private static final Logger logger = LogService.getLogger();
+ private static final String CLEAR_OPERATION = "_clearOperation";
+
+ private final int retryTime = 2 * 60 * 1000 /* partitionedRegion.getRetryTimeout() */;
Review comment:
This timeout still seems arbitrary. Is there a system property or default timeout that we could reference here instead of hard-coding the value? Why can't we use the value of partitionedRegion.getRetryTimeout() and set it in the constructor? Having a custom timeout just for the clear operation that is different from other region operations seems inconsistent.
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [geode] DonalEvans commented on a change in pull request #4987: GEODE-7678: Support for cache-listener and client-notification for Partitioned Region Clear operation.
Posted by GitBox <gi...@apache.org>.
DonalEvans commented on a change in pull request #4987:
URL: https://github.com/apache/geode/pull/4987#discussion_r425294146
##########
File path: geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionAfterClearNotificationDUnitTest.java
##########
@@ -0,0 +1,379 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.geode.internal.cache;
+
+import static java.util.concurrent.TimeUnit.SECONDS;
+import static org.apache.geode.test.dunit.rules.ClusterStartupRule.getCache;
+import static org.apache.geode.test.dunit.rules.ClusterStartupRule.getClientCache;
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.Properties;
+import java.util.concurrent.TimeoutException;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.stream.IntStream;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+
+import org.apache.geode.cache.InterestResultPolicy;
+import org.apache.geode.cache.PartitionAttributesFactory;
+import org.apache.geode.cache.Region;
+import org.apache.geode.cache.RegionEvent;
+import org.apache.geode.cache.RegionShortcut;
+import org.apache.geode.cache.client.ClientRegionShortcut;
+import org.apache.geode.cache.server.CacheServer;
+import org.apache.geode.cache.util.CacheListenerAdapter;
+import org.apache.geode.distributed.internal.ClusterDistributionManager;
+import org.apache.geode.distributed.internal.DistributionMessage;
+import org.apache.geode.distributed.internal.DistributionMessageObserver;
+import org.apache.geode.test.awaitility.GeodeAwaitility;
+import org.apache.geode.test.dunit.AsyncInvocation;
+import org.apache.geode.test.dunit.DUnitBlackboard;
+import org.apache.geode.test.dunit.SerializableCallableIF;
+import org.apache.geode.test.dunit.rules.ClientVM;
+import org.apache.geode.test.dunit.rules.ClusterStartupRule;
+import org.apache.geode.test.dunit.rules.MemberVM;
+
+public class PartitionedRegionAfterClearNotificationDUnitTest implements Serializable {
+ protected static final String REGION_NAME = "testPR";
+ protected static final int NUM_ENTRIES = 100;
+
+ protected int locatorPort;
+ protected MemberVM locator;
+ protected MemberVM dataStore1, dataStore2, dataStore3, accessor;
+ protected ClientVM client1, client2;
+
+ private static volatile DUnitBlackboard blackboard;
+
+ @Rule
+ public ClusterStartupRule cluster = new ClusterStartupRule(7);
+
+ @Before
+ public void setUp() throws Exception {
+ locator = cluster.startLocatorVM(0);
+ locatorPort = locator.getPort();
+ dataStore1 = cluster.startServerVM(1, getProperties(), locatorPort);
+ dataStore2 = cluster.startServerVM(2, getProperties(), locatorPort);
+ dataStore3 = cluster.startServerVM(3, getProperties(), locatorPort);
+ accessor = cluster.startServerVM(4, getProperties(), locatorPort);
+
+ client1 = cluster.startClientVM(5,
+ c -> c.withPoolSubscription(true).withLocatorConnection((locatorPort)));
+ client2 = cluster.startClientVM(6,
+ c -> c.withPoolSubscription(true).withLocatorConnection((locatorPort)));
+
+ dataStore1.invoke(this::initDataStore);
+ dataStore2.invoke(this::initDataStore);
+ dataStore3.invoke(this::initDataStore);
+ accessor.invoke(this::initAccessor);
+
+ getBlackboard().initBlackboard();
+ }
+
+ protected RegionShortcut getRegionShortCut() {
+ return RegionShortcut.PARTITION_REDUNDANT;
+ }
+
+ protected Properties getProperties() {
+ Properties properties = new Properties();
+ // properties.setProperty("log-level", "info");
+ return properties;
+ }
+
+ private Region getRegion(boolean isClient) {
+ if (isClient) {
+ return getClientCache().getRegion(REGION_NAME);
+ } else {
+ return getCache().getRegion(REGION_NAME);
+ }
+ }
+
+ private void verifyRegionSize(boolean isClient, int expectedNum) {
+ GeodeAwaitility.await()
+ .untilAsserted(() -> assertThat(getRegion(isClient).size()).isEqualTo(expectedNum));
+ }
+
+ private void initClientCache() {
+ Region region = getClientCache().createClientRegionFactory(ClientRegionShortcut.CACHING_PROXY)
+ .create(REGION_NAME);
+ region.registerInterestForAllKeys(InterestResultPolicy.KEYS);
+ }
+
+ private void stopServers() {
+ List<CacheServer> cacheServers = getCache().getCacheServers();
+ for (CacheServer server : cacheServers) {
+ server.stop();
+ }
+ }
+
+ private void initDataStore() {
+ getCache().createRegionFactory(getRegionShortCut())
+ .setPartitionAttributes(new PartitionAttributesFactory().setTotalNumBuckets(10).create())
+ .addCacheListener(new CountingCacheListener())
+ .create(REGION_NAME);
+ }
+
+ private void initAccessor() {
+ RegionShortcut shortcut = getRegionShortCut();
+ if (shortcut.isPersistent()) {
+ if (shortcut == RegionShortcut.PARTITION_PERSISTENT) {
+ shortcut = RegionShortcut.PARTITION;
+ } else if (shortcut == RegionShortcut.PARTITION_PERSISTENT_OVERFLOW) {
+ shortcut = RegionShortcut.PARTITION_OVERFLOW;
+ } else if (shortcut == RegionShortcut.PARTITION_REDUNDANT_PERSISTENT) {
+ shortcut = RegionShortcut.PARTITION_REDUNDANT;
+ } else if (shortcut == RegionShortcut.PARTITION_REDUNDANT_PERSISTENT_OVERFLOW) {
+ shortcut = RegionShortcut.PARTITION_REDUNDANT_OVERFLOW;
+ }
+ }
Review comment:
In this test, `RegionShortcut` is always `PARTITION_REDUNDANT` so this check is not needed.
##########
File path: geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionClearDUnitTest.java
##########
@@ -0,0 +1,400 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.geode.internal.cache;
+
+import static org.apache.geode.internal.Assert.fail;
+import static org.apache.geode.test.dunit.rules.ClusterStartupRule.getCache;
+import static org.apache.geode.test.dunit.rules.ClusterStartupRule.getClientCache;
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Properties;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.stream.IntStream;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+
+import org.apache.geode.cache.CacheWriterException;
+import org.apache.geode.cache.InterestResultPolicy;
+import org.apache.geode.cache.PartitionAttributesFactory;
+import org.apache.geode.cache.Region;
+import org.apache.geode.cache.RegionEvent;
+import org.apache.geode.cache.RegionFactory;
+import org.apache.geode.cache.RegionShortcut;
+import org.apache.geode.cache.client.ClientRegionShortcut;
+import org.apache.geode.cache.util.CacheWriterAdapter;
+import org.apache.geode.test.dunit.SerializableCallableIF;
+import org.apache.geode.test.dunit.rules.ClientVM;
+import org.apache.geode.test.dunit.rules.ClusterStartupRule;
+import org.apache.geode.test.dunit.rules.MemberVM;
+
+public class PartitionedRegionClearDUnitTest implements Serializable {
+ protected static final String REGION_NAME = "testPR";
+ protected static final int TOTAL_BUCKET_NUM = 10;
+ protected static final int NUM_ENTRIES = 1000;
+
+ protected int locatorPort;
+ protected MemberVM locator;
+ protected MemberVM dataStore1, dataStore2, dataStore3, accessor;
+ protected ClientVM client1, client2;
+
+ private static final Logger logger = LogManager.getLogger();
+
+ @Rule
+ public ClusterStartupRule cluster = new ClusterStartupRule(7);
+
+ @Before
+ public void setUp() throws Exception {
+ locator = cluster.startLocatorVM(0);
+ locatorPort = locator.getPort();
+ dataStore1 = cluster.startServerVM(1, getProperties(), locatorPort);
+ dataStore2 = cluster.startServerVM(2, getProperties(), locatorPort);
+ dataStore3 = cluster.startServerVM(3, getProperties(), locatorPort);
+ accessor = cluster.startServerVM(4, getProperties(), locatorPort);
+ client1 = cluster.startClientVM(5,
+ c -> c.withPoolSubscription(true).withLocatorConnection((locatorPort)));
+ client2 = cluster.startClientVM(6,
+ c -> c.withPoolSubscription(true).withLocatorConnection((locatorPort)));
+ }
+
+ protected RegionShortcut getRegionShortCut() {
+ return RegionShortcut.PARTITION_REDUNDANT;
+ }
+
+ protected Properties getProperties() {
+ Properties properties = new Properties();
+ properties.setProperty("log-level", "info");
+ return properties;
+ }
+
+ private Region getRegion(boolean isClient) {
+ if (isClient) {
+ return getClientCache().getRegion(REGION_NAME);
+ } else {
+ return getCache().getRegion(REGION_NAME);
+ }
+ }
+
+ private void verifyRegionSize(boolean isClient, int expectedNum) {
+ assertThat(getRegion(isClient).size()).isEqualTo(expectedNum);
+ }
+
+ private void initClientCache() {
+ Region region = getClientCache().createClientRegionFactory(ClientRegionShortcut.CACHING_PROXY)
+ .create(REGION_NAME);
+ region.registerInterestForAllKeys(InterestResultPolicy.KEYS);
+ }
+
+ private void initDataStore(boolean withWriter) {
+ RegionFactory factory = getCache().createRegionFactory(getRegionShortCut())
+ .setPartitionAttributes(
+ new PartitionAttributesFactory().setTotalNumBuckets(TOTAL_BUCKET_NUM).create());
+ if (withWriter) {
+ factory.setCacheWriter(new CountingCacheWriter());
+ }
+ factory.create(REGION_NAME);
+ clearsByRegion = new HashMap<>();
+ destroysByRegion = new HashMap<>();
+ }
+
+ private void initAccessor(boolean withWriter) {
+ RegionShortcut shortcut = getRegionShortCut();
+ if (shortcut.isPersistent()) {
+ if (shortcut == RegionShortcut.PARTITION_PERSISTENT) {
+ shortcut = RegionShortcut.PARTITION;
+ } else if (shortcut == RegionShortcut.PARTITION_PERSISTENT_OVERFLOW) {
+ shortcut = RegionShortcut.PARTITION_OVERFLOW;
+ } else if (shortcut == RegionShortcut.PARTITION_REDUNDANT_PERSISTENT) {
+ shortcut = RegionShortcut.PARTITION_REDUNDANT;
+ } else if (shortcut == RegionShortcut.PARTITION_REDUNDANT_PERSISTENT_OVERFLOW) {
+ shortcut = RegionShortcut.PARTITION_REDUNDANT_OVERFLOW;
+ } else {
+ fail("Wrong region type:" + shortcut);
+ }
+ }
+ RegionFactory factory = getCache().createRegionFactory(shortcut)
+ .setPartitionAttributes(
+ new PartitionAttributesFactory().setTotalNumBuckets(10).setLocalMaxMemory(0).create())
+ .setPartitionAttributes(new PartitionAttributesFactory().setTotalNumBuckets(10).create());
+ if (withWriter) {
+ factory.setCacheWriter(new CountingCacheWriter());
+ }
+ factory.create(REGION_NAME);
+ clearsByRegion = new HashMap<>();
+ destroysByRegion = new HashMap<>();
+ }
+
+ private void feed(boolean isClient) {
+ Region region = getRegion(isClient);
+ IntStream.range(0, NUM_ENTRIES).forEach(i -> region.put(i, "value" + i));
+ }
+
+ private void verifyServerRegionSize(int expectedNum) {
+ accessor.invoke(() -> verifyRegionSize(false, expectedNum));
+ dataStore1.invoke(() -> verifyRegionSize(false, expectedNum));
+ dataStore2.invoke(() -> verifyRegionSize(false, expectedNum));
+ dataStore3.invoke(() -> verifyRegionSize(false, expectedNum));
+ }
+
+ private void verifyClientRegionSize(int expectedNum) {
+ client1.invoke(() -> verifyRegionSize(true, expectedNum));
+ // TODO: notify register clients
+ // client2.invoke(()->verifyRegionSize(true, expectedNum));
Review comment:
Can these comments be removed?
##########
File path: geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegion.java
##########
@@ -2144,18 +2147,207 @@ public void writeToDisk() {
throw new UnsupportedOperationException();
}
- /**
- * @since GemFire 5.0
- * @throws UnsupportedOperationException OVERRIDES
- */
- @Override
- public void clear() {
- throw new UnsupportedOperationException();
+ /* @Override */
Review comment:
Can this commented out section be removed?
##########
File path: geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionClearDUnitTest.java
##########
@@ -0,0 +1,400 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.geode.internal.cache;
+
+import static org.apache.geode.internal.Assert.fail;
+import static org.apache.geode.test.dunit.rules.ClusterStartupRule.getCache;
+import static org.apache.geode.test.dunit.rules.ClusterStartupRule.getClientCache;
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Properties;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.stream.IntStream;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+
+import org.apache.geode.cache.CacheWriterException;
+import org.apache.geode.cache.InterestResultPolicy;
+import org.apache.geode.cache.PartitionAttributesFactory;
+import org.apache.geode.cache.Region;
+import org.apache.geode.cache.RegionEvent;
+import org.apache.geode.cache.RegionFactory;
+import org.apache.geode.cache.RegionShortcut;
+import org.apache.geode.cache.client.ClientRegionShortcut;
+import org.apache.geode.cache.util.CacheWriterAdapter;
+import org.apache.geode.test.dunit.SerializableCallableIF;
+import org.apache.geode.test.dunit.rules.ClientVM;
+import org.apache.geode.test.dunit.rules.ClusterStartupRule;
+import org.apache.geode.test.dunit.rules.MemberVM;
+
+public class PartitionedRegionClearDUnitTest implements Serializable {
+ protected static final String REGION_NAME = "testPR";
+ protected static final int TOTAL_BUCKET_NUM = 10;
+ protected static final int NUM_ENTRIES = 1000;
+
+ protected int locatorPort;
+ protected MemberVM locator;
+ protected MemberVM dataStore1, dataStore2, dataStore3, accessor;
+ protected ClientVM client1, client2;
Review comment:
It was recently discussed on the dev list that declarations should be one per line.
##########
File path: geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionClearDUnitTest.java
##########
@@ -0,0 +1,400 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.geode.internal.cache;
+
+import static org.apache.geode.internal.Assert.fail;
+import static org.apache.geode.test.dunit.rules.ClusterStartupRule.getCache;
+import static org.apache.geode.test.dunit.rules.ClusterStartupRule.getClientCache;
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Properties;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.stream.IntStream;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+
+import org.apache.geode.cache.CacheWriterException;
+import org.apache.geode.cache.InterestResultPolicy;
+import org.apache.geode.cache.PartitionAttributesFactory;
+import org.apache.geode.cache.Region;
+import org.apache.geode.cache.RegionEvent;
+import org.apache.geode.cache.RegionFactory;
+import org.apache.geode.cache.RegionShortcut;
+import org.apache.geode.cache.client.ClientRegionShortcut;
+import org.apache.geode.cache.util.CacheWriterAdapter;
+import org.apache.geode.test.dunit.SerializableCallableIF;
+import org.apache.geode.test.dunit.rules.ClientVM;
+import org.apache.geode.test.dunit.rules.ClusterStartupRule;
+import org.apache.geode.test.dunit.rules.MemberVM;
+
+public class PartitionedRegionClearDUnitTest implements Serializable {
+ protected static final String REGION_NAME = "testPR";
+ protected static final int TOTAL_BUCKET_NUM = 10;
+ protected static final int NUM_ENTRIES = 1000;
+
+ protected int locatorPort;
+ protected MemberVM locator;
+ protected MemberVM dataStore1, dataStore2, dataStore3, accessor;
+ protected ClientVM client1, client2;
+
+ private static final Logger logger = LogManager.getLogger();
+
+ @Rule
+ public ClusterStartupRule cluster = new ClusterStartupRule(7);
+
+ @Before
+ public void setUp() throws Exception {
+ locator = cluster.startLocatorVM(0);
+ locatorPort = locator.getPort();
+ dataStore1 = cluster.startServerVM(1, getProperties(), locatorPort);
+ dataStore2 = cluster.startServerVM(2, getProperties(), locatorPort);
+ dataStore3 = cluster.startServerVM(3, getProperties(), locatorPort);
+ accessor = cluster.startServerVM(4, getProperties(), locatorPort);
+ client1 = cluster.startClientVM(5,
+ c -> c.withPoolSubscription(true).withLocatorConnection((locatorPort)));
+ client2 = cluster.startClientVM(6,
+ c -> c.withPoolSubscription(true).withLocatorConnection((locatorPort)));
+ }
+
+ protected RegionShortcut getRegionShortCut() {
+ return RegionShortcut.PARTITION_REDUNDANT;
+ }
+
+ protected Properties getProperties() {
+ Properties properties = new Properties();
+ properties.setProperty("log-level", "info");
Review comment:
I believe that the log level is "info" by default, so this method should not be necessary.
##########
File path: geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionAfterClearNotificationDUnitTest.java
##########
@@ -0,0 +1,379 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.geode.internal.cache;
+
+import static java.util.concurrent.TimeUnit.SECONDS;
+import static org.apache.geode.test.dunit.rules.ClusterStartupRule.getCache;
+import static org.apache.geode.test.dunit.rules.ClusterStartupRule.getClientCache;
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.Properties;
+import java.util.concurrent.TimeoutException;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.stream.IntStream;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+
+import org.apache.geode.cache.InterestResultPolicy;
+import org.apache.geode.cache.PartitionAttributesFactory;
+import org.apache.geode.cache.Region;
+import org.apache.geode.cache.RegionEvent;
+import org.apache.geode.cache.RegionShortcut;
+import org.apache.geode.cache.client.ClientRegionShortcut;
+import org.apache.geode.cache.server.CacheServer;
+import org.apache.geode.cache.util.CacheListenerAdapter;
+import org.apache.geode.distributed.internal.ClusterDistributionManager;
+import org.apache.geode.distributed.internal.DistributionMessage;
+import org.apache.geode.distributed.internal.DistributionMessageObserver;
+import org.apache.geode.test.awaitility.GeodeAwaitility;
+import org.apache.geode.test.dunit.AsyncInvocation;
+import org.apache.geode.test.dunit.DUnitBlackboard;
+import org.apache.geode.test.dunit.SerializableCallableIF;
+import org.apache.geode.test.dunit.rules.ClientVM;
+import org.apache.geode.test.dunit.rules.ClusterStartupRule;
+import org.apache.geode.test.dunit.rules.MemberVM;
+
+public class PartitionedRegionAfterClearNotificationDUnitTest implements Serializable {
+ protected static final String REGION_NAME = "testPR";
+ protected static final int NUM_ENTRIES = 100;
+
+ protected int locatorPort;
+ protected MemberVM locator;
+ protected MemberVM dataStore1, dataStore2, dataStore3, accessor;
+ protected ClientVM client1, client2;
+
+ private static volatile DUnitBlackboard blackboard;
+
+ @Rule
+ public ClusterStartupRule cluster = new ClusterStartupRule(7);
+
+ @Before
+ public void setUp() throws Exception {
+ locator = cluster.startLocatorVM(0);
+ locatorPort = locator.getPort();
+ dataStore1 = cluster.startServerVM(1, getProperties(), locatorPort);
+ dataStore2 = cluster.startServerVM(2, getProperties(), locatorPort);
+ dataStore3 = cluster.startServerVM(3, getProperties(), locatorPort);
+ accessor = cluster.startServerVM(4, getProperties(), locatorPort);
+
+ client1 = cluster.startClientVM(5,
+ c -> c.withPoolSubscription(true).withLocatorConnection((locatorPort)));
+ client2 = cluster.startClientVM(6,
+ c -> c.withPoolSubscription(true).withLocatorConnection((locatorPort)));
+
+ dataStore1.invoke(this::initDataStore);
+ dataStore2.invoke(this::initDataStore);
+ dataStore3.invoke(this::initDataStore);
+ accessor.invoke(this::initAccessor);
+
+ getBlackboard().initBlackboard();
+ }
+
+ protected RegionShortcut getRegionShortCut() {
+ return RegionShortcut.PARTITION_REDUNDANT;
+ }
+
+ protected Properties getProperties() {
+ Properties properties = new Properties();
+ // properties.setProperty("log-level", "info");
Review comment:
This comment can probably be removed, along with the method, since the properties will then be empty.
##########
File path: geode-core/src/main/java/org/apache/geode/cache/Region.java
##########
@@ -1303,6 +1303,10 @@ Object selectValue(String queryPredicate) throws FunctionDomainException, TypeMi
* @see CacheListener#afterRegionClear
* @see CacheWriter#beforeRegionClear
* @throws UnsupportedOperationException If the region is a partitioned region
+ * @throws PartitionedRegionPartialClearException when data is partially cleared on partitioned
+ * region. Its caller responsibility to handle the partial data clear either by retrying
+ * the clear
+ * operation or continue working with the partially cleared partitioned region.
Review comment:
This first line is no longer true, and the second line probably doesn't need the "It's caller responsibility..." part, since it can be assumed that it's always the caller's responsibility to handle exceptions.
##########
File path: geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionAfterClearNotificationDUnitTest.java
##########
@@ -0,0 +1,379 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.geode.internal.cache;
+
+import static java.util.concurrent.TimeUnit.SECONDS;
+import static org.apache.geode.test.dunit.rules.ClusterStartupRule.getCache;
+import static org.apache.geode.test.dunit.rules.ClusterStartupRule.getClientCache;
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.Properties;
+import java.util.concurrent.TimeoutException;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.stream.IntStream;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+
+import org.apache.geode.cache.InterestResultPolicy;
+import org.apache.geode.cache.PartitionAttributesFactory;
+import org.apache.geode.cache.Region;
+import org.apache.geode.cache.RegionEvent;
+import org.apache.geode.cache.RegionShortcut;
+import org.apache.geode.cache.client.ClientRegionShortcut;
+import org.apache.geode.cache.server.CacheServer;
+import org.apache.geode.cache.util.CacheListenerAdapter;
+import org.apache.geode.distributed.internal.ClusterDistributionManager;
+import org.apache.geode.distributed.internal.DistributionMessage;
+import org.apache.geode.distributed.internal.DistributionMessageObserver;
+import org.apache.geode.test.awaitility.GeodeAwaitility;
+import org.apache.geode.test.dunit.AsyncInvocation;
+import org.apache.geode.test.dunit.DUnitBlackboard;
+import org.apache.geode.test.dunit.SerializableCallableIF;
+import org.apache.geode.test.dunit.rules.ClientVM;
+import org.apache.geode.test.dunit.rules.ClusterStartupRule;
+import org.apache.geode.test.dunit.rules.MemberVM;
+
+public class PartitionedRegionAfterClearNotificationDUnitTest implements Serializable {
+ protected static final String REGION_NAME = "testPR";
+ protected static final int NUM_ENTRIES = 100;
+
+ protected int locatorPort;
+ protected MemberVM locator;
+ protected MemberVM dataStore1, dataStore2, dataStore3, accessor;
+ protected ClientVM client1, client2;
+
+ private static volatile DUnitBlackboard blackboard;
+
+ @Rule
+ public ClusterStartupRule cluster = new ClusterStartupRule(7);
+
+ @Before
+ public void setUp() throws Exception {
+ locator = cluster.startLocatorVM(0);
+ locatorPort = locator.getPort();
+ dataStore1 = cluster.startServerVM(1, getProperties(), locatorPort);
+ dataStore2 = cluster.startServerVM(2, getProperties(), locatorPort);
+ dataStore3 = cluster.startServerVM(3, getProperties(), locatorPort);
+ accessor = cluster.startServerVM(4, getProperties(), locatorPort);
+
+ client1 = cluster.startClientVM(5,
+ c -> c.withPoolSubscription(true).withLocatorConnection((locatorPort)));
+ client2 = cluster.startClientVM(6,
+ c -> c.withPoolSubscription(true).withLocatorConnection((locatorPort)));
+
+ dataStore1.invoke(this::initDataStore);
+ dataStore2.invoke(this::initDataStore);
+ dataStore3.invoke(this::initDataStore);
+ accessor.invoke(this::initAccessor);
+
+ getBlackboard().initBlackboard();
+ }
+
+ protected RegionShortcut getRegionShortCut() {
+ return RegionShortcut.PARTITION_REDUNDANT;
+ }
Review comment:
Since this method always returns `PARTITION_REDUNDANT`, could it be replaced with a constant field?
##########
File path: geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionClearDUnitTest.java
##########
@@ -0,0 +1,400 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.geode.internal.cache;
+
+import static org.apache.geode.internal.Assert.fail;
+import static org.apache.geode.test.dunit.rules.ClusterStartupRule.getCache;
+import static org.apache.geode.test.dunit.rules.ClusterStartupRule.getClientCache;
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Properties;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.stream.IntStream;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+
+import org.apache.geode.cache.CacheWriterException;
+import org.apache.geode.cache.InterestResultPolicy;
+import org.apache.geode.cache.PartitionAttributesFactory;
+import org.apache.geode.cache.Region;
+import org.apache.geode.cache.RegionEvent;
+import org.apache.geode.cache.RegionFactory;
+import org.apache.geode.cache.RegionShortcut;
+import org.apache.geode.cache.client.ClientRegionShortcut;
+import org.apache.geode.cache.util.CacheWriterAdapter;
+import org.apache.geode.test.dunit.SerializableCallableIF;
+import org.apache.geode.test.dunit.rules.ClientVM;
+import org.apache.geode.test.dunit.rules.ClusterStartupRule;
+import org.apache.geode.test.dunit.rules.MemberVM;
+
+public class PartitionedRegionClearDUnitTest implements Serializable {
+ protected static final String REGION_NAME = "testPR";
+ protected static final int TOTAL_BUCKET_NUM = 10;
+ protected static final int NUM_ENTRIES = 1000;
+
+ protected int locatorPort;
+ protected MemberVM locator;
+ protected MemberVM dataStore1, dataStore2, dataStore3, accessor;
+ protected ClientVM client1, client2;
+
+ private static final Logger logger = LogManager.getLogger();
+
+ @Rule
+ public ClusterStartupRule cluster = new ClusterStartupRule(7);
+
+ @Before
+ public void setUp() throws Exception {
+ locator = cluster.startLocatorVM(0);
+ locatorPort = locator.getPort();
+ dataStore1 = cluster.startServerVM(1, getProperties(), locatorPort);
+ dataStore2 = cluster.startServerVM(2, getProperties(), locatorPort);
+ dataStore3 = cluster.startServerVM(3, getProperties(), locatorPort);
+ accessor = cluster.startServerVM(4, getProperties(), locatorPort);
+ client1 = cluster.startClientVM(5,
+ c -> c.withPoolSubscription(true).withLocatorConnection((locatorPort)));
+ client2 = cluster.startClientVM(6,
+ c -> c.withPoolSubscription(true).withLocatorConnection((locatorPort)));
+ }
+
+ protected RegionShortcut getRegionShortCut() {
+ return RegionShortcut.PARTITION_REDUNDANT;
+ }
+
+ protected Properties getProperties() {
+ Properties properties = new Properties();
+ properties.setProperty("log-level", "info");
+ return properties;
+ }
+
+ private Region getRegion(boolean isClient) {
+ if (isClient) {
+ return getClientCache().getRegion(REGION_NAME);
+ } else {
+ return getCache().getRegion(REGION_NAME);
+ }
+ }
+
+ private void verifyRegionSize(boolean isClient, int expectedNum) {
+ assertThat(getRegion(isClient).size()).isEqualTo(expectedNum);
+ }
+
+ private void initClientCache() {
+ Region region = getClientCache().createClientRegionFactory(ClientRegionShortcut.CACHING_PROXY)
+ .create(REGION_NAME);
+ region.registerInterestForAllKeys(InterestResultPolicy.KEYS);
+ }
+
+ private void initDataStore(boolean withWriter) {
+ RegionFactory factory = getCache().createRegionFactory(getRegionShortCut())
+ .setPartitionAttributes(
+ new PartitionAttributesFactory().setTotalNumBuckets(TOTAL_BUCKET_NUM).create());
+ if (withWriter) {
+ factory.setCacheWriter(new CountingCacheWriter());
+ }
+ factory.create(REGION_NAME);
+ clearsByRegion = new HashMap<>();
+ destroysByRegion = new HashMap<>();
+ }
+
+ private void initAccessor(boolean withWriter) {
+ RegionShortcut shortcut = getRegionShortCut();
+ if (shortcut.isPersistent()) {
+ if (shortcut == RegionShortcut.PARTITION_PERSISTENT) {
+ shortcut = RegionShortcut.PARTITION;
+ } else if (shortcut == RegionShortcut.PARTITION_PERSISTENT_OVERFLOW) {
+ shortcut = RegionShortcut.PARTITION_OVERFLOW;
+ } else if (shortcut == RegionShortcut.PARTITION_REDUNDANT_PERSISTENT) {
+ shortcut = RegionShortcut.PARTITION_REDUNDANT;
+ } else if (shortcut == RegionShortcut.PARTITION_REDUNDANT_PERSISTENT_OVERFLOW) {
+ shortcut = RegionShortcut.PARTITION_REDUNDANT_OVERFLOW;
+ } else {
+ fail("Wrong region type:" + shortcut);
+ }
+ }
+ RegionFactory factory = getCache().createRegionFactory(shortcut)
+ .setPartitionAttributes(
+ new PartitionAttributesFactory().setTotalNumBuckets(10).setLocalMaxMemory(0).create())
+ .setPartitionAttributes(new PartitionAttributesFactory().setTotalNumBuckets(10).create());
Review comment:
`setPartitionAttributes()` is called twice here.
##########
File path: geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionClearDUnitTest.java
##########
@@ -0,0 +1,400 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.geode.internal.cache;
+
+import static org.apache.geode.internal.Assert.fail;
+import static org.apache.geode.test.dunit.rules.ClusterStartupRule.getCache;
+import static org.apache.geode.test.dunit.rules.ClusterStartupRule.getClientCache;
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Properties;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.stream.IntStream;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+
+import org.apache.geode.cache.CacheWriterException;
+import org.apache.geode.cache.InterestResultPolicy;
+import org.apache.geode.cache.PartitionAttributesFactory;
+import org.apache.geode.cache.Region;
+import org.apache.geode.cache.RegionEvent;
+import org.apache.geode.cache.RegionFactory;
+import org.apache.geode.cache.RegionShortcut;
+import org.apache.geode.cache.client.ClientRegionShortcut;
+import org.apache.geode.cache.util.CacheWriterAdapter;
+import org.apache.geode.test.dunit.SerializableCallableIF;
+import org.apache.geode.test.dunit.rules.ClientVM;
+import org.apache.geode.test.dunit.rules.ClusterStartupRule;
+import org.apache.geode.test.dunit.rules.MemberVM;
+
+public class PartitionedRegionClearDUnitTest implements Serializable {
+ protected static final String REGION_NAME = "testPR";
+ protected static final int TOTAL_BUCKET_NUM = 10;
+ protected static final int NUM_ENTRIES = 1000;
+
+ protected int locatorPort;
+ protected MemberVM locator;
+ protected MemberVM dataStore1, dataStore2, dataStore3, accessor;
+ protected ClientVM client1, client2;
+
+ private static final Logger logger = LogManager.getLogger();
+
+ @Rule
+ public ClusterStartupRule cluster = new ClusterStartupRule(7);
+
+ @Before
+ public void setUp() throws Exception {
+ locator = cluster.startLocatorVM(0);
+ locatorPort = locator.getPort();
+ dataStore1 = cluster.startServerVM(1, getProperties(), locatorPort);
+ dataStore2 = cluster.startServerVM(2, getProperties(), locatorPort);
+ dataStore3 = cluster.startServerVM(3, getProperties(), locatorPort);
+ accessor = cluster.startServerVM(4, getProperties(), locatorPort);
+ client1 = cluster.startClientVM(5,
+ c -> c.withPoolSubscription(true).withLocatorConnection((locatorPort)));
+ client2 = cluster.startClientVM(6,
+ c -> c.withPoolSubscription(true).withLocatorConnection((locatorPort)));
+ }
+
+ protected RegionShortcut getRegionShortCut() {
+ return RegionShortcut.PARTITION_REDUNDANT;
+ }
+
+ protected Properties getProperties() {
+ Properties properties = new Properties();
+ properties.setProperty("log-level", "info");
+ return properties;
+ }
+
+ private Region getRegion(boolean isClient) {
+ if (isClient) {
+ return getClientCache().getRegion(REGION_NAME);
+ } else {
+ return getCache().getRegion(REGION_NAME);
+ }
+ }
+
+ private void verifyRegionSize(boolean isClient, int expectedNum) {
+ assertThat(getRegion(isClient).size()).isEqualTo(expectedNum);
+ }
+
+ private void initClientCache() {
+ Region region = getClientCache().createClientRegionFactory(ClientRegionShortcut.CACHING_PROXY)
+ .create(REGION_NAME);
+ region.registerInterestForAllKeys(InterestResultPolicy.KEYS);
+ }
+
+ private void initDataStore(boolean withWriter) {
+ RegionFactory factory = getCache().createRegionFactory(getRegionShortCut())
+ .setPartitionAttributes(
+ new PartitionAttributesFactory().setTotalNumBuckets(TOTAL_BUCKET_NUM).create());
+ if (withWriter) {
+ factory.setCacheWriter(new CountingCacheWriter());
+ }
+ factory.create(REGION_NAME);
+ clearsByRegion = new HashMap<>();
+ destroysByRegion = new HashMap<>();
+ }
+
+ private void initAccessor(boolean withWriter) {
+ RegionShortcut shortcut = getRegionShortCut();
+ if (shortcut.isPersistent()) {
+ if (shortcut == RegionShortcut.PARTITION_PERSISTENT) {
+ shortcut = RegionShortcut.PARTITION;
+ } else if (shortcut == RegionShortcut.PARTITION_PERSISTENT_OVERFLOW) {
+ shortcut = RegionShortcut.PARTITION_OVERFLOW;
+ } else if (shortcut == RegionShortcut.PARTITION_REDUNDANT_PERSISTENT) {
+ shortcut = RegionShortcut.PARTITION_REDUNDANT;
+ } else if (shortcut == RegionShortcut.PARTITION_REDUNDANT_PERSISTENT_OVERFLOW) {
+ shortcut = RegionShortcut.PARTITION_REDUNDANT_OVERFLOW;
+ } else {
+ fail("Wrong region type:" + shortcut);
+ }
+ }
Review comment:
The region shortcut is always `PARTITION_REDUNDANT` in this test, so this block is not necessary.
##########
File path: geode-core/src/test/java/org/apache/geode/internal/cache/DistributedRegionJUnitTest.java
##########
@@ -246,4 +255,13 @@ public void testRetriedBasicBridgeReplaceShouldNotCreateNewVersionTag() {
region.basicBridgeReplace("key1", "value1", false, null, client, true, clientEvent);
assertThat(clientEvent.getVersionTag().equals(tag));
}
+
+ @Test(expected = UnsupportedOperationException.class)
+ public void localClearIsNotSupportedOnReplicatedRegion() {
+ RegionEventImpl event = createClearRegionEvent();
+ DistributedRegion region = (DistributedRegion) event.getRegion();
+ region.basicLocalClear(event);
+ fail("Expect UnsupportedOperationException");
+ }
Review comment:
Can this test instead assert that the `UnsupportedOperationException` is thrown from the `basicLocalClear()` call, rather than using an expected exception?
##########
File path: geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegionClear.java
##########
@@ -30,18 +31,22 @@
import org.apache.geode.internal.cache.versions.RegionVersionVector;
import org.apache.geode.logging.internal.log4j.api.LogService;
-public class ClearPartitionedRegion {
+public class PartitionedRegionClear {
private static final Logger logger = LogService.getLogger();
+ private static final String CLEAR_OPERATION = "_clearOperation";
+
+ private final int retryTime = 2 * 60 * 1000 /* partitionedRegion.getRetryTimeout() */;
Review comment:
Could this possibly be replaced with a `Duration`? It would help prevent ambiguity over the units of the timeout.
##########
File path: geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionClearDUnitTest.java
##########
@@ -0,0 +1,400 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.geode.internal.cache;
+
+import static org.apache.geode.internal.Assert.fail;
+import static org.apache.geode.test.dunit.rules.ClusterStartupRule.getCache;
+import static org.apache.geode.test.dunit.rules.ClusterStartupRule.getClientCache;
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Properties;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.stream.IntStream;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+
+import org.apache.geode.cache.CacheWriterException;
+import org.apache.geode.cache.InterestResultPolicy;
+import org.apache.geode.cache.PartitionAttributesFactory;
+import org.apache.geode.cache.Region;
+import org.apache.geode.cache.RegionEvent;
+import org.apache.geode.cache.RegionFactory;
+import org.apache.geode.cache.RegionShortcut;
+import org.apache.geode.cache.client.ClientRegionShortcut;
+import org.apache.geode.cache.util.CacheWriterAdapter;
+import org.apache.geode.test.dunit.SerializableCallableIF;
+import org.apache.geode.test.dunit.rules.ClientVM;
+import org.apache.geode.test.dunit.rules.ClusterStartupRule;
+import org.apache.geode.test.dunit.rules.MemberVM;
+
+public class PartitionedRegionClearDUnitTest implements Serializable {
+ protected static final String REGION_NAME = "testPR";
+ protected static final int TOTAL_BUCKET_NUM = 10;
+ protected static final int NUM_ENTRIES = 1000;
+
+ protected int locatorPort;
+ protected MemberVM locator;
+ protected MemberVM dataStore1, dataStore2, dataStore3, accessor;
+ protected ClientVM client1, client2;
+
+ private static final Logger logger = LogManager.getLogger();
+
+ @Rule
+ public ClusterStartupRule cluster = new ClusterStartupRule(7);
+
+ @Before
+ public void setUp() throws Exception {
+ locator = cluster.startLocatorVM(0);
+ locatorPort = locator.getPort();
+ dataStore1 = cluster.startServerVM(1, getProperties(), locatorPort);
+ dataStore2 = cluster.startServerVM(2, getProperties(), locatorPort);
+ dataStore3 = cluster.startServerVM(3, getProperties(), locatorPort);
+ accessor = cluster.startServerVM(4, getProperties(), locatorPort);
+ client1 = cluster.startClientVM(5,
+ c -> c.withPoolSubscription(true).withLocatorConnection((locatorPort)));
+ client2 = cluster.startClientVM(6,
+ c -> c.withPoolSubscription(true).withLocatorConnection((locatorPort)));
+ }
+
+ protected RegionShortcut getRegionShortCut() {
+ return RegionShortcut.PARTITION_REDUNDANT;
+ }
Review comment:
Since this method always returns the same thing, could it be replaced with a constant field?
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [geode] agingade commented on a change in pull request #4987: GEODE-7678: Support for cache-listener and client-notification for Partitioned Region Clear operation.
Posted by GitBox <gi...@apache.org>.
agingade commented on a change in pull request #4987:
URL: https://github.com/apache/geode/pull/4987#discussion_r425411854
##########
File path: geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionAfterClearNotificationDUnitTest.java
##########
@@ -0,0 +1,379 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.geode.internal.cache;
+
+import static java.util.concurrent.TimeUnit.SECONDS;
+import static org.apache.geode.test.dunit.rules.ClusterStartupRule.getCache;
+import static org.apache.geode.test.dunit.rules.ClusterStartupRule.getClientCache;
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.Properties;
+import java.util.concurrent.TimeoutException;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.stream.IntStream;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+
+import org.apache.geode.cache.InterestResultPolicy;
+import org.apache.geode.cache.PartitionAttributesFactory;
+import org.apache.geode.cache.Region;
+import org.apache.geode.cache.RegionEvent;
+import org.apache.geode.cache.RegionShortcut;
+import org.apache.geode.cache.client.ClientRegionShortcut;
+import org.apache.geode.cache.server.CacheServer;
+import org.apache.geode.cache.util.CacheListenerAdapter;
+import org.apache.geode.distributed.internal.ClusterDistributionManager;
+import org.apache.geode.distributed.internal.DistributionMessage;
+import org.apache.geode.distributed.internal.DistributionMessageObserver;
+import org.apache.geode.test.awaitility.GeodeAwaitility;
+import org.apache.geode.test.dunit.AsyncInvocation;
+import org.apache.geode.test.dunit.DUnitBlackboard;
+import org.apache.geode.test.dunit.SerializableCallableIF;
+import org.apache.geode.test.dunit.rules.ClientVM;
+import org.apache.geode.test.dunit.rules.ClusterStartupRule;
+import org.apache.geode.test.dunit.rules.MemberVM;
+
+public class PartitionedRegionAfterClearNotificationDUnitTest implements Serializable {
+ protected static final String REGION_NAME = "testPR";
+ protected static final int NUM_ENTRIES = 100;
+
+ protected int locatorPort;
+ protected MemberVM locator;
+ protected MemberVM dataStore1, dataStore2, dataStore3, accessor;
+ protected ClientVM client1, client2;
+
+ private static volatile DUnitBlackboard blackboard;
+
+ @Rule
+ public ClusterStartupRule cluster = new ClusterStartupRule(7);
Review comment:
Copied this test from an existing test.
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [geode] gesterzhou commented on a change in pull request #4987: GEODE-7678: Support for cache-listener and client-notification for Partitioned Region Clear operation.
Posted by GitBox <gi...@apache.org>.
gesterzhou commented on a change in pull request #4987:
URL: https://github.com/apache/geode/pull/4987#discussion_r414132510
##########
File path: geode-core/src/main/java/org/apache/geode/internal/cache/ClearPartitionedRegion.java
##########
@@ -0,0 +1,342 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.geode.internal.cache;
+
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Iterator;
+
+import org.apache.logging.log4j.Logger;
+
+import org.apache.geode.CancelException;
+import org.apache.geode.cache.Operation;
+import org.apache.geode.cache.partition.PartitionRegionHelper;
+import org.apache.geode.distributed.internal.DistributionManager;
+import org.apache.geode.distributed.internal.MembershipListener;
+import org.apache.geode.distributed.internal.ReplyException;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.cache.versions.RegionVersionVector;
+import org.apache.geode.logging.internal.log4j.api.LogService;
+
+public class ClearPartitionedRegion {
+
+ private static final Logger logger = LogService.getLogger();
+
+ private final PartitionedRegion partitionedRegion;
+
+ private LockForListenerAndClientNotification lockForListenerAndClientNotification =
+ new LockForListenerAndClientNotification();
+
+ public ClearPartitionedRegion(PartitionedRegion partitionedRegion) {
+ this.partitionedRegion = partitionedRegion;
+ partitionedRegion.getDistributionManager()
+ .addMembershipListener(new ClearPartitionedRegionListener());
+ }
+
+ public boolean isLockedForListenerAndClientNotification() {
+ return lockForListenerAndClientNotification.isLocked();
+ }
+
+ void acquireDistributedClearLock(String clearLock) {
+ try {
+ partitionedRegion.getPartitionedRegionLockService().lock(clearLock, -1, -1);
+ } catch (IllegalStateException e) {
+ partitionedRegion.lockCheckReadiness();
+ throw e;
+ }
+ }
+
+ void releaseDistributedClearLock(String clearLock) {
+ try {
+ partitionedRegion.getPartitionedRegionLockService().unlock(clearLock);
+ } catch (IllegalStateException e) {
+ partitionedRegion.lockCheckReadiness();
+ } catch (Exception ex) {
+ logger.warn("Caught exception while unlocking clear distributed lock", ex.getMessage());
+ }
+ }
+
+ void obtainWriteLockForClear(RegionEventImpl event) {
+ sendLocalClearRegionMessage(event,
+ ClearPartitionedRegionMessage.OperationType.OP_LOCK_FOR_CLEAR);
+ obtainClearLockLocal(partitionedRegion.getDistributionManager().getId());
+ }
+
+ void releaseWriteLockForClear(RegionEventImpl event) {
+ sendLocalClearRegionMessage(event,
+ ClearPartitionedRegionMessage.OperationType.OP_UNLOCK_FOR_CLEAR);
+ releaseClearLockLocal();
+ }
+
+ void clearRegion(RegionEventImpl regionEvent, boolean cacheWrite,
+ RegionVersionVector vector) {
+ clearRegionLocal(regionEvent, cacheWrite, null);
+ sendLocalClearRegionMessage(regionEvent,
+ ClearPartitionedRegionMessage.OperationType.OP_CLEAR);
+ }
+
+ public void clearRegionLocal(RegionEventImpl regionEvent, boolean cacheWrite,
+ RegionVersionVector vector) {
+ // Synchronized to handle the requester departure.
+ synchronized (lockForListenerAndClientNotification) {
Review comment:
Do you need to sync here again while you have synchronized (clearLock) in PR?
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [geode] agingade commented on a change in pull request #4987: GEODE-7678: Support for cache-listener and client-notification for Partitioned Region Clear operation.
Posted by GitBox <gi...@apache.org>.
agingade commented on a change in pull request #4987:
URL: https://github.com/apache/geode/pull/4987#discussion_r417691691
##########
File path: geode-core/src/distributedTest/java/org/apache/geode/cache/ReplicateCacheListenerDistributedTest.java
##########
@@ -302,4 +349,64 @@ public void afterDestroy(final EntryEvent<String, Integer> event) {
errorCollector.checkThat(event.getNewValue(), nullValue());
}
}
+
+ protected class ClearCountingCacheListener extends BaseCacheListener {
Review comment:
It looks like from original implementation, along with after* event, the tests also verifies certain states with different operation. You are right there is opportunity to clean this test and refactor. I will try to file a separate ticket for this.
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [geode] agingade commented on a change in pull request #4987: GEODE-7678: Support for cache-listener and client-notification for Partitioned Region Clear operation.
Posted by GitBox <gi...@apache.org>.
agingade commented on a change in pull request #4987:
URL: https://github.com/apache/geode/pull/4987#discussion_r426082029
##########
File path: geode-core/src/main/java/org/apache/geode/cache/Region.java
##########
@@ -1303,6 +1303,10 @@ Object selectValue(String queryPredicate) throws FunctionDomainException, TypeMi
* @see CacheListener#afterRegionClear
* @see CacheWriter#beforeRegionClear
* @throws UnsupportedOperationException If the region is a partitioned region
+ * @throws PartitionedRegionPartialClearException when data is partially cleared on partitioned
+ * region. Its caller responsibility to handle the partial data clear either by retrying
+ * the clear
+ * operation or continue working with the partially cleared partitioned region.
Review comment:
Fixed the first one.
I wanted highlight the consequence partial clear and how it can be addressed by the caller.
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [geode] gesterzhou commented on a change in pull request #4987: GEODE-7678: Support for cache-listener and client-notification for Partitioned Region Clear operation.
Posted by GitBox <gi...@apache.org>.
gesterzhou commented on a change in pull request #4987:
URL: https://github.com/apache/geode/pull/4987#discussion_r419637164
##########
File path: geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionClearWithExpirationDUnitTest.java
##########
@@ -281,6 +283,19 @@ private void registerVMKillerAsCacheWriter(List<VM> vmsToBounce) {
}));
}
Review comment:
I don't know what the code change here caused the test PartitionedRegionClearWithExpirationDUnitTest to take 72 minutes to finish, while it took 17 minutes(still quite long) in GEODE-7665 branch
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [geode] agingade commented on a change in pull request #4987: GEODE-7678: Support for cache-listener and client-notification for Partitioned Region Clear operation.
Posted by GitBox <gi...@apache.org>.
agingade commented on a change in pull request #4987:
URL: https://github.com/apache/geode/pull/4987#discussion_r419173757
##########
File path: geode-core/src/main/java/org/apache/geode/internal/cache/InternalRegion.java
##########
@@ -459,4 +459,7 @@ VersionedObjectList basicRemoveAll(Collection<Object> keys,
* @return true if synchronization should be attempted
*/
boolean shouldSyncForCrashedMember(InternalDistributedMember id);
+
+ void clearRegionLocally(RegionEventImpl regionEvent, boolean cacheWrite,
Review comment:
Not sure, what you meant here...InternalRegion is an interface and I added method in that to have access of it in the implemented classes.
##########
File path: geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegionClear.java
##########
@@ -30,18 +31,22 @@
import org.apache.geode.internal.cache.versions.RegionVersionVector;
import org.apache.geode.logging.internal.log4j.api.LogService;
-public class ClearPartitionedRegion {
+public class PartitionedRegionClear {
private static final Logger logger = LogService.getLogger();
+ private static final String CLEAR_OPERATION = "_clearOperation";
+
+ private final int retryTime = 2 * 60 * 1000 /* partitionedRegion.getRetryTimeout() */;
Review comment:
Gester, This is the timeout used to wait for secondary buckets to become primary...Looking at the code and the test failures i have seen, its indeterministic and there is no easy way to wait and notify on this action.
##########
File path: geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegionClear.java
##########
@@ -30,18 +31,22 @@
import org.apache.geode.internal.cache.versions.RegionVersionVector;
import org.apache.geode.logging.internal.log4j.api.LogService;
-public class ClearPartitionedRegion {
+public class PartitionedRegionClear {
private static final Logger logger = LogService.getLogger();
+ private static final String CLEAR_OPERATION = "_clearOperation";
+
+ private final int retryTime = 2 * 60 * 1000 /* partitionedRegion.getRetryTimeout() */;
Review comment:
The "partitionedRegion.getRetryTimeout()" is an hour long. In clear operation case, it doesn't make sense to wait for so long. Instead we throw partial clear exception and letting user to handle that.
##########
File path: geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegionClear.java
##########
@@ -30,18 +31,22 @@
import org.apache.geode.internal.cache.versions.RegionVersionVector;
import org.apache.geode.logging.internal.log4j.api.LogService;
-public class ClearPartitionedRegion {
+public class PartitionedRegionClear {
private static final Logger logger = LogService.getLogger();
+ private static final String CLEAR_OPERATION = "_clearOperation";
+
+ private final int retryTime = 2 * 60 * 1000 /* partitionedRegion.getRetryTimeout() */;
Review comment:
@DonalEvans Also, adding system property, it doesn't look like it will be of any help to application and I am not convinced that this needs a system property. In this case if we are unable to find Primary bucket getting elected in a given time we are throwing partial clear exception; based on which user can take further action, like retry.
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [geode] gesterzhou commented on a change in pull request #4987: GEODE-7678: Support for cache-listener and client-notification for Partitioned Region Clear operation.
Posted by GitBox <gi...@apache.org>.
gesterzhou commented on a change in pull request #4987:
URL: https://github.com/apache/geode/pull/4987#discussion_r416954212
##########
File path: geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegion.java
##########
@@ -10373,4 +10377,27 @@ void updatePartitionRegionConfig(
public SenderIdMonitor getSenderIdMonitor() {
return senderIdMonitor;
}
+
+ protected ClearPartitionedRegion getClearPartitionedRegion() {
+ return clearPartitionedRegion;
+ }
+
+ @Override
+ void cmnClearRegion(RegionEventImpl regionEvent, boolean cacheWrite, boolean useRVV) {
+ // Synchronized to avoid other threads invoking clear on this vm/node.
+ synchronized (clearLock) {
+ clearPartitionedRegion.doClear(regionEvent, cacheWrite, this);
Review comment:
I wonder before calling doClear(), we need to call: final TXStateProxy tx = cache.getTXMgr().pauseTransaction();
Since we will get rvvLock for all buckets before clear, there's no guaranteed sequence for getting rvvlock for buckets, if some on-going tx requested some rvvLock on some buckets (such as bucket1) and is requesting rvvLock on bucket2. If clear thread did not pause the transaction, there could be deadlock.
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [geode] pivotal-eshu commented on a change in pull request #4987: GEODE-7678: Support for cache-listener and client-notification for Partitioned Region Clear operation.
Posted by GitBox <gi...@apache.org>.
pivotal-eshu commented on a change in pull request #4987:
URL: https://github.com/apache/geode/pull/4987#discussion_r420348846
##########
File path: geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegion.java
##########
@@ -10373,4 +10377,27 @@ void updatePartitionRegionConfig(
public SenderIdMonitor getSenderIdMonitor() {
return senderIdMonitor;
}
+
+ protected ClearPartitionedRegion getClearPartitionedRegion() {
+ return clearPartitionedRegion;
+ }
+
+ @Override
+ void cmnClearRegion(RegionEventImpl regionEvent, boolean cacheWrite, boolean useRVV) {
+ // Synchronized to avoid other threads invoking clear on this vm/node.
+ synchronized (clearLock) {
+ clearPartitionedRegion.doClear(regionEvent, cacheWrite, this);
Review comment:
clear as a region operations can not be executed under transaction. It will throw UnsupportedOperation.
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [geode] gesterzhou commented on a change in pull request #4987: GEODE-7678: Support for cache-listener and client-notification for Partitioned Region Clear operation.
Posted by GitBox <gi...@apache.org>.
gesterzhou commented on a change in pull request #4987:
URL: https://github.com/apache/geode/pull/4987#discussion_r414720095
##########
File path: geode-core/src/main/java/org/apache/geode/internal/cache/ClearPartitionedRegion.java
##########
@@ -0,0 +1,347 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.geode.internal.cache;
+
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Iterator;
+
+import org.apache.logging.log4j.Logger;
+
+import org.apache.geode.CancelException;
+import org.apache.geode.cache.Operation;
+import org.apache.geode.cache.partition.PartitionRegionHelper;
+import org.apache.geode.distributed.internal.DistributionManager;
+import org.apache.geode.distributed.internal.MembershipListener;
+import org.apache.geode.distributed.internal.ReplyException;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.cache.versions.RegionVersionVector;
+import org.apache.geode.logging.internal.log4j.api.LogService;
+
+public class ClearPartitionedRegion {
+
+ private static final Logger logger = LogService.getLogger();
+
+ private final PartitionedRegion partitionedRegion;
+
+ private LockForListenerAndClientNotification lockForListenerAndClientNotification =
+ new LockForListenerAndClientNotification();
+
+ public ClearPartitionedRegion(PartitionedRegion partitionedRegion) {
+ this.partitionedRegion = partitionedRegion;
+ partitionedRegion.getDistributionManager()
+ .addMembershipListener(new ClearPartitionedRegionListener());
+ }
+
+ public boolean isLockedForListenerAndClientNotification() {
+ return lockForListenerAndClientNotification.isLocked();
+ }
+
+ void acquireDistributedClearLock(String clearLock) {
+ try {
+ partitionedRegion.getPartitionedRegionLockService().lock(clearLock, -1, -1);
+ } catch (IllegalStateException e) {
+ partitionedRegion.lockCheckReadiness();
+ throw e;
+ }
+ }
+
+ void releaseDistributedClearLock(String clearLock) {
+ try {
+ partitionedRegion.getPartitionedRegionLockService().unlock(clearLock);
+ } catch (IllegalStateException e) {
+ partitionedRegion.lockCheckReadiness();
+ } catch (Exception ex) {
+ logger.warn("Caught exception while unlocking clear distributed lock", ex.getMessage());
+ }
+ }
+
+ void obtainWriteLockForClear(RegionEventImpl event) {
+ sendLocalClearRegionMessage(event,
+ ClearPartitionedRegionMessage.OperationType.OP_LOCK_FOR_CLEAR);
+ obtainClearLockLocal(partitionedRegion.getDistributionManager().getId());
+ }
+
+ void releaseWriteLockForClear(RegionEventImpl event) {
+ sendLocalClearRegionMessage(event,
+ ClearPartitionedRegionMessage.OperationType.OP_UNLOCK_FOR_CLEAR);
+ releaseClearLockLocal();
+ }
+
+ void clearRegion(RegionEventImpl regionEvent, boolean cacheWrite,
+ RegionVersionVector vector) {
+ clearRegionLocal(regionEvent, cacheWrite, null);
+ sendLocalClearRegionMessage(regionEvent,
+ ClearPartitionedRegionMessage.OperationType.OP_CLEAR);
+ }
+
+ public void clearRegionLocal(RegionEventImpl regionEvent, boolean cacheWrite,
+ RegionVersionVector vector) {
+ logger.info("#### CPR.clearRegionLocal", new Exception("DEBUG"));
+ // Synchronized to handle the requester departure.
+ synchronized (lockForListenerAndClientNotification) {
+ if (partitionedRegion.getDataStore() != null) {
+ partitionedRegion.getDataStore().lockBucketCreationForRegionClear();
+ try {
+ for (BucketRegion localPrimaryBucketRegion : partitionedRegion.getDataStore()
+ .getAllLocalPrimaryBucketRegions()) {
+ localPrimaryBucketRegion.clear();
+ }
+ doAfterClear(regionEvent);
+ } finally {
+ partitionedRegion.getDataStore().unLockBucketCreationForRegionClear();
+ }
+ } else {
+ // Non data-store with client queue and listener
+ doAfterClear(regionEvent);
+ }
+ }
+ }
+
+ private void doAfterClear(RegionEventImpl regionEvent) {
+ logger
+ .info("#### doAfterClear clientInterested: " + partitionedRegion.hasAnyClientsInterested());
+ if (partitionedRegion.hasAnyClientsInterested()) {
+ notifyClients(regionEvent);
+ }
+
+ if (partitionedRegion.hasListener()) {
+ partitionedRegion.dispatchListenerEvent(EnumListenerEvent.AFTER_REGION_CLEAR, regionEvent);
+ }
+ }
+
+ void notifyClients(RegionEventImpl event) {
+ // Set client routing information into the event
+ // The clear operation in case of PR is distributed differently
+ // hence the FilterRoutingInfo is set here instead of
+ // DistributedCacheOperation.distribute().
+ event.setEventType(EnumListenerEvent.AFTER_REGION_CLEAR);
+ if (!partitionedRegion.isUsedForMetaRegion() && !partitionedRegion
+ .isUsedForPartitionedRegionAdmin()
+ && !partitionedRegion.isUsedForPartitionedRegionBucket() && !partitionedRegion
+ .isUsedForParallelGatewaySenderQueue()) {
+
+ FilterRoutingInfo localCqFrInfo =
+ partitionedRegion.getFilterProfile().getFilterRoutingInfoPart1(event,
+ FilterProfile.NO_PROFILES, Collections.emptySet());
+
+ FilterRoutingInfo localCqInterestFrInfo =
+ partitionedRegion.getFilterProfile().getFilterRoutingInfoPart2(localCqFrInfo, event);
+
+ if (localCqInterestFrInfo != null) {
+ event.setLocalFilterInfo(localCqInterestFrInfo.getLocalFilterInfo());
+ }
+ }
+ partitionedRegion.notifyBridgeClients(event);
+ }
+
+ protected void obtainClearLockLocal(InternalDistributedMember requester) {
+ synchronized (lockForListenerAndClientNotification) {
+ if (!partitionedRegion.getDistributionManager().isCurrentMember(requester)) {
+ return;
+ }
+
+ lockForListenerAndClientNotification.setLocked(requester);
Review comment:
BTW, where is the code to pre-create all the buckets? The code will prevent a new primary bucket created somewhere else. I remember previous version has that code.
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [geode] gesterzhou commented on a change in pull request #4987: GEODE-7678: Support for cache-listener and client-notification for Partitioned Region Clear operation.
Posted by GitBox <gi...@apache.org>.
gesterzhou commented on a change in pull request #4987:
URL: https://github.com/apache/geode/pull/4987#discussion_r414718677
##########
File path: geode-core/src/main/java/org/apache/geode/internal/cache/ClearPartitionedRegion.java
##########
@@ -0,0 +1,347 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.geode.internal.cache;
+
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Iterator;
+
+import org.apache.logging.log4j.Logger;
+
+import org.apache.geode.CancelException;
+import org.apache.geode.cache.Operation;
+import org.apache.geode.cache.partition.PartitionRegionHelper;
+import org.apache.geode.distributed.internal.DistributionManager;
+import org.apache.geode.distributed.internal.MembershipListener;
+import org.apache.geode.distributed.internal.ReplyException;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.cache.versions.RegionVersionVector;
+import org.apache.geode.logging.internal.log4j.api.LogService;
+
+public class ClearPartitionedRegion {
+
+ private static final Logger logger = LogService.getLogger();
+
+ private final PartitionedRegion partitionedRegion;
+
+ private LockForListenerAndClientNotification lockForListenerAndClientNotification =
+ new LockForListenerAndClientNotification();
+
+ public ClearPartitionedRegion(PartitionedRegion partitionedRegion) {
+ this.partitionedRegion = partitionedRegion;
+ partitionedRegion.getDistributionManager()
+ .addMembershipListener(new ClearPartitionedRegionListener());
+ }
+
+ public boolean isLockedForListenerAndClientNotification() {
+ return lockForListenerAndClientNotification.isLocked();
+ }
+
+ void acquireDistributedClearLock(String clearLock) {
+ try {
+ partitionedRegion.getPartitionedRegionLockService().lock(clearLock, -1, -1);
+ } catch (IllegalStateException e) {
+ partitionedRegion.lockCheckReadiness();
+ throw e;
+ }
+ }
+
+ void releaseDistributedClearLock(String clearLock) {
+ try {
+ partitionedRegion.getPartitionedRegionLockService().unlock(clearLock);
+ } catch (IllegalStateException e) {
+ partitionedRegion.lockCheckReadiness();
+ } catch (Exception ex) {
+ logger.warn("Caught exception while unlocking clear distributed lock", ex.getMessage());
+ }
+ }
+
+ void obtainWriteLockForClear(RegionEventImpl event) {
+ sendLocalClearRegionMessage(event,
+ ClearPartitionedRegionMessage.OperationType.OP_LOCK_FOR_CLEAR);
+ obtainClearLockLocal(partitionedRegion.getDistributionManager().getId());
+ }
+
+ void releaseWriteLockForClear(RegionEventImpl event) {
+ sendLocalClearRegionMessage(event,
+ ClearPartitionedRegionMessage.OperationType.OP_UNLOCK_FOR_CLEAR);
+ releaseClearLockLocal();
+ }
+
+ void clearRegion(RegionEventImpl regionEvent, boolean cacheWrite,
+ RegionVersionVector vector) {
+ clearRegionLocal(regionEvent, cacheWrite, null);
+ sendLocalClearRegionMessage(regionEvent,
+ ClearPartitionedRegionMessage.OperationType.OP_CLEAR);
+ }
+
+ public void clearRegionLocal(RegionEventImpl regionEvent, boolean cacheWrite,
+ RegionVersionVector vector) {
+ logger.info("#### CPR.clearRegionLocal", new Exception("DEBUG"));
+ // Synchronized to handle the requester departure.
+ synchronized (lockForListenerAndClientNotification) {
+ if (partitionedRegion.getDataStore() != null) {
+ partitionedRegion.getDataStore().lockBucketCreationForRegionClear();
+ try {
+ for (BucketRegion localPrimaryBucketRegion : partitionedRegion.getDataStore()
+ .getAllLocalPrimaryBucketRegions()) {
+ localPrimaryBucketRegion.clear();
+ }
+ doAfterClear(regionEvent);
+ } finally {
+ partitionedRegion.getDataStore().unLockBucketCreationForRegionClear();
+ }
+ } else {
+ // Non data-store with client queue and listener
+ doAfterClear(regionEvent);
+ }
+ }
+ }
+
+ private void doAfterClear(RegionEventImpl regionEvent) {
+ logger
+ .info("#### doAfterClear clientInterested: " + partitionedRegion.hasAnyClientsInterested());
+ if (partitionedRegion.hasAnyClientsInterested()) {
+ notifyClients(regionEvent);
+ }
+
+ if (partitionedRegion.hasListener()) {
+ partitionedRegion.dispatchListenerEvent(EnumListenerEvent.AFTER_REGION_CLEAR, regionEvent);
+ }
+ }
+
+ void notifyClients(RegionEventImpl event) {
+ // Set client routing information into the event
+ // The clear operation in case of PR is distributed differently
+ // hence the FilterRoutingInfo is set here instead of
+ // DistributedCacheOperation.distribute().
+ event.setEventType(EnumListenerEvent.AFTER_REGION_CLEAR);
+ if (!partitionedRegion.isUsedForMetaRegion() && !partitionedRegion
+ .isUsedForPartitionedRegionAdmin()
+ && !partitionedRegion.isUsedForPartitionedRegionBucket() && !partitionedRegion
+ .isUsedForParallelGatewaySenderQueue()) {
+
+ FilterRoutingInfo localCqFrInfo =
+ partitionedRegion.getFilterProfile().getFilterRoutingInfoPart1(event,
+ FilterProfile.NO_PROFILES, Collections.emptySet());
+
+ FilterRoutingInfo localCqInterestFrInfo =
+ partitionedRegion.getFilterProfile().getFilterRoutingInfoPart2(localCqFrInfo, event);
+
+ if (localCqInterestFrInfo != null) {
+ event.setLocalFilterInfo(localCqInterestFrInfo.getLocalFilterInfo());
+ }
+ }
+ partitionedRegion.notifyBridgeClients(event);
+ }
+
+ protected void obtainClearLockLocal(InternalDistributedMember requester) {
+ synchronized (lockForListenerAndClientNotification) {
+ if (!partitionedRegion.getDistributionManager().isCurrentMember(requester)) {
Review comment:
is this possible?
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [geode] gesterzhou commented on a change in pull request #4987: GEODE-7678: Support for cache-listener and client-notification for Partitioned Region Clear operation.
Posted by GitBox <gi...@apache.org>.
gesterzhou commented on a change in pull request #4987:
URL: https://github.com/apache/geode/pull/4987#discussion_r419530348
##########
File path: geode-core/src/main/java/org/apache/geode/cache/PartitionedRegionPartialClearException.java
##########
@@ -0,0 +1,40 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.geode.cache;
+
+/**
+ * Indicates a failure to perform a distributed operation on a Partitioned Region after multiple
+ * attempts.
+ *
+ * @since GemFire 5.1
+ */
+public class PartitionedRegionPartialClearException extends CacheRuntimeException {
+
+ public PartitionedRegionPartialClearException() {
+ super();
+ }
+
Review comment:
This exception is a placeholder. I have not seen a place to throw it. Let another story to throw and handle the exception.
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [geode] agingade commented on a change in pull request #4987: GEODE-7678: Support for cache-listener and client-notification for Partitioned Region Clear operation.
Posted by GitBox <gi...@apache.org>.
agingade commented on a change in pull request #4987:
URL: https://github.com/apache/geode/pull/4987#discussion_r417709848
##########
File path: geode-core/src/main/java/org/apache/geode/internal/cache/ClearPartitionedRegion.java
##########
@@ -0,0 +1,347 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.geode.internal.cache;
+
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Iterator;
+
+import org.apache.logging.log4j.Logger;
+
+import org.apache.geode.CancelException;
+import org.apache.geode.cache.Operation;
+import org.apache.geode.cache.partition.PartitionRegionHelper;
+import org.apache.geode.distributed.internal.DistributionManager;
+import org.apache.geode.distributed.internal.MembershipListener;
+import org.apache.geode.distributed.internal.ReplyException;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.cache.versions.RegionVersionVector;
+import org.apache.geode.logging.internal.log4j.api.LogService;
+
+public class ClearPartitionedRegion {
+
+ private static final Logger logger = LogService.getLogger();
+
+ private final PartitionedRegion partitionedRegion;
+
+ private LockForListenerAndClientNotification lockForListenerAndClientNotification =
+ new LockForListenerAndClientNotification();
+
+ public ClearPartitionedRegion(PartitionedRegion partitionedRegion) {
+ this.partitionedRegion = partitionedRegion;
+ partitionedRegion.getDistributionManager()
+ .addMembershipListener(new ClearPartitionedRegionListener());
+ }
+
+ public boolean isLockedForListenerAndClientNotification() {
+ return lockForListenerAndClientNotification.isLocked();
+ }
+
+ void acquireDistributedClearLock(String clearLock) {
+ try {
+ partitionedRegion.getPartitionedRegionLockService().lock(clearLock, -1, -1);
+ } catch (IllegalStateException e) {
+ partitionedRegion.lockCheckReadiness();
+ throw e;
+ }
+ }
+
+ void releaseDistributedClearLock(String clearLock) {
+ try {
+ partitionedRegion.getPartitionedRegionLockService().unlock(clearLock);
+ } catch (IllegalStateException e) {
+ partitionedRegion.lockCheckReadiness();
+ } catch (Exception ex) {
+ logger.warn("Caught exception while unlocking clear distributed lock", ex.getMessage());
+ }
+ }
+
+ void obtainWriteLockForClear(RegionEventImpl event) {
+ sendLocalClearRegionMessage(event,
+ ClearPartitionedRegionMessage.OperationType.OP_LOCK_FOR_CLEAR);
+ obtainClearLockLocal(partitionedRegion.getDistributionManager().getId());
+ }
+
+ void releaseWriteLockForClear(RegionEventImpl event) {
+ sendLocalClearRegionMessage(event,
+ ClearPartitionedRegionMessage.OperationType.OP_UNLOCK_FOR_CLEAR);
+ releaseClearLockLocal();
+ }
+
+ void clearRegion(RegionEventImpl regionEvent, boolean cacheWrite,
+ RegionVersionVector vector) {
+ clearRegionLocal(regionEvent, cacheWrite, null);
+ sendLocalClearRegionMessage(regionEvent,
+ ClearPartitionedRegionMessage.OperationType.OP_CLEAR);
+ }
+
+ public void clearRegionLocal(RegionEventImpl regionEvent, boolean cacheWrite,
+ RegionVersionVector vector) {
+ logger.info("#### CPR.clearRegionLocal", new Exception("DEBUG"));
+ // Synchronized to handle the requester departure.
+ synchronized (lockForListenerAndClientNotification) {
+ if (partitionedRegion.getDataStore() != null) {
+ partitionedRegion.getDataStore().lockBucketCreationForRegionClear();
+ try {
+ for (BucketRegion localPrimaryBucketRegion : partitionedRegion.getDataStore()
+ .getAllLocalPrimaryBucketRegions()) {
+ localPrimaryBucketRegion.clear();
+ }
+ doAfterClear(regionEvent);
+ } finally {
+ partitionedRegion.getDataStore().unLockBucketCreationForRegionClear();
+ }
+ } else {
+ // Non data-store with client queue and listener
+ doAfterClear(regionEvent);
+ }
+ }
+ }
+
+ private void doAfterClear(RegionEventImpl regionEvent) {
+ logger
+ .info("#### doAfterClear clientInterested: " + partitionedRegion.hasAnyClientsInterested());
+ if (partitionedRegion.hasAnyClientsInterested()) {
+ notifyClients(regionEvent);
+ }
+
+ if (partitionedRegion.hasListener()) {
+ partitionedRegion.dispatchListenerEvent(EnumListenerEvent.AFTER_REGION_CLEAR, regionEvent);
+ }
+ }
+
+ void notifyClients(RegionEventImpl event) {
+ // Set client routing information into the event
+ // The clear operation in case of PR is distributed differently
+ // hence the FilterRoutingInfo is set here instead of
+ // DistributedCacheOperation.distribute().
+ event.setEventType(EnumListenerEvent.AFTER_REGION_CLEAR);
+ if (!partitionedRegion.isUsedForMetaRegion() && !partitionedRegion
+ .isUsedForPartitionedRegionAdmin()
+ && !partitionedRegion.isUsedForPartitionedRegionBucket() && !partitionedRegion
+ .isUsedForParallelGatewaySenderQueue()) {
+
+ FilterRoutingInfo localCqFrInfo =
+ partitionedRegion.getFilterProfile().getFilterRoutingInfoPart1(event,
+ FilterProfile.NO_PROFILES, Collections.emptySet());
+
+ FilterRoutingInfo localCqInterestFrInfo =
+ partitionedRegion.getFilterProfile().getFilterRoutingInfoPart2(localCqFrInfo, event);
+
+ if (localCqInterestFrInfo != null) {
+ event.setLocalFilterInfo(localCqInterestFrInfo.getLocalFilterInfo());
+ }
+ }
+ partitionedRegion.notifyBridgeClients(event);
+ }
+
+ protected void obtainClearLockLocal(InternalDistributedMember requester) {
+ synchronized (lockForListenerAndClientNotification) {
Review comment:
Yes...This is to guard against member departure thread trying to unlock.
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [geode] gesterzhou commented on a change in pull request #4987: GEODE-7678: Support for cache-listener and client-notification for Partitioned Region Clear operation.
Posted by GitBox <gi...@apache.org>.
gesterzhou commented on a change in pull request #4987:
URL: https://github.com/apache/geode/pull/4987#discussion_r414720095
##########
File path: geode-core/src/main/java/org/apache/geode/internal/cache/ClearPartitionedRegion.java
##########
@@ -0,0 +1,347 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.geode.internal.cache;
+
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Iterator;
+
+import org.apache.logging.log4j.Logger;
+
+import org.apache.geode.CancelException;
+import org.apache.geode.cache.Operation;
+import org.apache.geode.cache.partition.PartitionRegionHelper;
+import org.apache.geode.distributed.internal.DistributionManager;
+import org.apache.geode.distributed.internal.MembershipListener;
+import org.apache.geode.distributed.internal.ReplyException;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.cache.versions.RegionVersionVector;
+import org.apache.geode.logging.internal.log4j.api.LogService;
+
+public class ClearPartitionedRegion {
+
+ private static final Logger logger = LogService.getLogger();
+
+ private final PartitionedRegion partitionedRegion;
+
+ private LockForListenerAndClientNotification lockForListenerAndClientNotification =
+ new LockForListenerAndClientNotification();
+
+ public ClearPartitionedRegion(PartitionedRegion partitionedRegion) {
+ this.partitionedRegion = partitionedRegion;
+ partitionedRegion.getDistributionManager()
+ .addMembershipListener(new ClearPartitionedRegionListener());
+ }
+
+ public boolean isLockedForListenerAndClientNotification() {
+ return lockForListenerAndClientNotification.isLocked();
+ }
+
+ void acquireDistributedClearLock(String clearLock) {
+ try {
+ partitionedRegion.getPartitionedRegionLockService().lock(clearLock, -1, -1);
+ } catch (IllegalStateException e) {
+ partitionedRegion.lockCheckReadiness();
+ throw e;
+ }
+ }
+
+ void releaseDistributedClearLock(String clearLock) {
+ try {
+ partitionedRegion.getPartitionedRegionLockService().unlock(clearLock);
+ } catch (IllegalStateException e) {
+ partitionedRegion.lockCheckReadiness();
+ } catch (Exception ex) {
+ logger.warn("Caught exception while unlocking clear distributed lock", ex.getMessage());
+ }
+ }
+
+ void obtainWriteLockForClear(RegionEventImpl event) {
+ sendLocalClearRegionMessage(event,
+ ClearPartitionedRegionMessage.OperationType.OP_LOCK_FOR_CLEAR);
+ obtainClearLockLocal(partitionedRegion.getDistributionManager().getId());
+ }
+
+ void releaseWriteLockForClear(RegionEventImpl event) {
+ sendLocalClearRegionMessage(event,
+ ClearPartitionedRegionMessage.OperationType.OP_UNLOCK_FOR_CLEAR);
+ releaseClearLockLocal();
+ }
+
+ void clearRegion(RegionEventImpl regionEvent, boolean cacheWrite,
+ RegionVersionVector vector) {
+ clearRegionLocal(regionEvent, cacheWrite, null);
+ sendLocalClearRegionMessage(regionEvent,
+ ClearPartitionedRegionMessage.OperationType.OP_CLEAR);
+ }
+
+ public void clearRegionLocal(RegionEventImpl regionEvent, boolean cacheWrite,
+ RegionVersionVector vector) {
+ logger.info("#### CPR.clearRegionLocal", new Exception("DEBUG"));
+ // Synchronized to handle the requester departure.
+ synchronized (lockForListenerAndClientNotification) {
+ if (partitionedRegion.getDataStore() != null) {
+ partitionedRegion.getDataStore().lockBucketCreationForRegionClear();
+ try {
+ for (BucketRegion localPrimaryBucketRegion : partitionedRegion.getDataStore()
+ .getAllLocalPrimaryBucketRegions()) {
+ localPrimaryBucketRegion.clear();
+ }
+ doAfterClear(regionEvent);
+ } finally {
+ partitionedRegion.getDataStore().unLockBucketCreationForRegionClear();
+ }
+ } else {
+ // Non data-store with client queue and listener
+ doAfterClear(regionEvent);
+ }
+ }
+ }
+
+ private void doAfterClear(RegionEventImpl regionEvent) {
+ logger
+ .info("#### doAfterClear clientInterested: " + partitionedRegion.hasAnyClientsInterested());
+ if (partitionedRegion.hasAnyClientsInterested()) {
+ notifyClients(regionEvent);
+ }
+
+ if (partitionedRegion.hasListener()) {
+ partitionedRegion.dispatchListenerEvent(EnumListenerEvent.AFTER_REGION_CLEAR, regionEvent);
+ }
+ }
+
+ void notifyClients(RegionEventImpl event) {
+ // Set client routing information into the event
+ // The clear operation in case of PR is distributed differently
+ // hence the FilterRoutingInfo is set here instead of
+ // DistributedCacheOperation.distribute().
+ event.setEventType(EnumListenerEvent.AFTER_REGION_CLEAR);
+ if (!partitionedRegion.isUsedForMetaRegion() && !partitionedRegion
+ .isUsedForPartitionedRegionAdmin()
+ && !partitionedRegion.isUsedForPartitionedRegionBucket() && !partitionedRegion
+ .isUsedForParallelGatewaySenderQueue()) {
+
+ FilterRoutingInfo localCqFrInfo =
+ partitionedRegion.getFilterProfile().getFilterRoutingInfoPart1(event,
+ FilterProfile.NO_PROFILES, Collections.emptySet());
+
+ FilterRoutingInfo localCqInterestFrInfo =
+ partitionedRegion.getFilterProfile().getFilterRoutingInfoPart2(localCqFrInfo, event);
+
+ if (localCqInterestFrInfo != null) {
+ event.setLocalFilterInfo(localCqInterestFrInfo.getLocalFilterInfo());
+ }
+ }
+ partitionedRegion.notifyBridgeClients(event);
+ }
+
+ protected void obtainClearLockLocal(InternalDistributedMember requester) {
+ synchronized (lockForListenerAndClientNotification) {
+ if (!partitionedRegion.getDistributionManager().isCurrentMember(requester)) {
+ return;
+ }
+
+ lockForListenerAndClientNotification.setLocked(requester);
Review comment:
BTW, where is the code to pre-create all the buckets? The code will prevent a new primary bucket created somewhere else. I remember previous version has that code.
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [geode] agingade commented on a change in pull request #4987: GEODE-7678: Support for cache-listener and client-notification for Partitioned Region Clear operation.
Posted by GitBox <gi...@apache.org>.
agingade commented on a change in pull request #4987:
URL: https://github.com/apache/geode/pull/4987#discussion_r417710113
##########
File path: geode-core/src/main/java/org/apache/geode/internal/cache/ClearPartitionedRegion.java
##########
@@ -0,0 +1,347 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.geode.internal.cache;
+
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Iterator;
+
+import org.apache.logging.log4j.Logger;
+
+import org.apache.geode.CancelException;
+import org.apache.geode.cache.Operation;
+import org.apache.geode.cache.partition.PartitionRegionHelper;
+import org.apache.geode.distributed.internal.DistributionManager;
+import org.apache.geode.distributed.internal.MembershipListener;
+import org.apache.geode.distributed.internal.ReplyException;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.cache.versions.RegionVersionVector;
+import org.apache.geode.logging.internal.log4j.api.LogService;
+
+public class ClearPartitionedRegion {
+
+ private static final Logger logger = LogService.getLogger();
+
+ private final PartitionedRegion partitionedRegion;
+
+ private LockForListenerAndClientNotification lockForListenerAndClientNotification =
+ new LockForListenerAndClientNotification();
+
+ public ClearPartitionedRegion(PartitionedRegion partitionedRegion) {
+ this.partitionedRegion = partitionedRegion;
+ partitionedRegion.getDistributionManager()
+ .addMembershipListener(new ClearPartitionedRegionListener());
+ }
+
+ public boolean isLockedForListenerAndClientNotification() {
+ return lockForListenerAndClientNotification.isLocked();
+ }
+
+ void acquireDistributedClearLock(String clearLock) {
+ try {
+ partitionedRegion.getPartitionedRegionLockService().lock(clearLock, -1, -1);
+ } catch (IllegalStateException e) {
+ partitionedRegion.lockCheckReadiness();
+ throw e;
+ }
+ }
+
+ void releaseDistributedClearLock(String clearLock) {
+ try {
+ partitionedRegion.getPartitionedRegionLockService().unlock(clearLock);
+ } catch (IllegalStateException e) {
+ partitionedRegion.lockCheckReadiness();
+ } catch (Exception ex) {
+ logger.warn("Caught exception while unlocking clear distributed lock", ex.getMessage());
+ }
+ }
+
+ void obtainWriteLockForClear(RegionEventImpl event) {
+ sendLocalClearRegionMessage(event,
+ ClearPartitionedRegionMessage.OperationType.OP_LOCK_FOR_CLEAR);
+ obtainClearLockLocal(partitionedRegion.getDistributionManager().getId());
+ }
+
+ void releaseWriteLockForClear(RegionEventImpl event) {
+ sendLocalClearRegionMessage(event,
+ ClearPartitionedRegionMessage.OperationType.OP_UNLOCK_FOR_CLEAR);
+ releaseClearLockLocal();
+ }
+
+ void clearRegion(RegionEventImpl regionEvent, boolean cacheWrite,
+ RegionVersionVector vector) {
+ clearRegionLocal(regionEvent, cacheWrite, null);
+ sendLocalClearRegionMessage(regionEvent,
+ ClearPartitionedRegionMessage.OperationType.OP_CLEAR);
+ }
+
+ public void clearRegionLocal(RegionEventImpl regionEvent, boolean cacheWrite,
+ RegionVersionVector vector) {
+ logger.info("#### CPR.clearRegionLocal", new Exception("DEBUG"));
+ // Synchronized to handle the requester departure.
+ synchronized (lockForListenerAndClientNotification) {
+ if (partitionedRegion.getDataStore() != null) {
+ partitionedRegion.getDataStore().lockBucketCreationForRegionClear();
+ try {
+ for (BucketRegion localPrimaryBucketRegion : partitionedRegion.getDataStore()
+ .getAllLocalPrimaryBucketRegions()) {
+ localPrimaryBucketRegion.clear();
+ }
+ doAfterClear(regionEvent);
+ } finally {
+ partitionedRegion.getDataStore().unLockBucketCreationForRegionClear();
+ }
+ } else {
+ // Non data-store with client queue and listener
+ doAfterClear(regionEvent);
+ }
+ }
+ }
+
+ private void doAfterClear(RegionEventImpl regionEvent) {
+ logger
+ .info("#### doAfterClear clientInterested: " + partitionedRegion.hasAnyClientsInterested());
+ if (partitionedRegion.hasAnyClientsInterested()) {
+ notifyClients(regionEvent);
+ }
+
+ if (partitionedRegion.hasListener()) {
+ partitionedRegion.dispatchListenerEvent(EnumListenerEvent.AFTER_REGION_CLEAR, regionEvent);
+ }
+ }
+
+ void notifyClients(RegionEventImpl event) {
+ // Set client routing information into the event
+ // The clear operation in case of PR is distributed differently
+ // hence the FilterRoutingInfo is set here instead of
+ // DistributedCacheOperation.distribute().
+ event.setEventType(EnumListenerEvent.AFTER_REGION_CLEAR);
+ if (!partitionedRegion.isUsedForMetaRegion() && !partitionedRegion
+ .isUsedForPartitionedRegionAdmin()
+ && !partitionedRegion.isUsedForPartitionedRegionBucket() && !partitionedRegion
+ .isUsedForParallelGatewaySenderQueue()) {
+
+ FilterRoutingInfo localCqFrInfo =
+ partitionedRegion.getFilterProfile().getFilterRoutingInfoPart1(event,
+ FilterProfile.NO_PROFILES, Collections.emptySet());
+
+ FilterRoutingInfo localCqInterestFrInfo =
+ partitionedRegion.getFilterProfile().getFilterRoutingInfoPart2(localCqFrInfo, event);
+
+ if (localCqInterestFrInfo != null) {
+ event.setLocalFilterInfo(localCqInterestFrInfo.getLocalFilterInfo());
+ }
+ }
+ partitionedRegion.notifyBridgeClients(event);
+ }
+
+ protected void obtainClearLockLocal(InternalDistributedMember requester) {
+ synchronized (lockForListenerAndClientNotification) {
+ if (!partitionedRegion.getDistributionManager().isCurrentMember(requester)) {
Review comment:
This is added check to see if the member is still in the membership view.
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [geode] gesterzhou commented on a change in pull request #4987: GEODE-7678: Support for cache-listener and client-notification for Partitioned Region Clear operation.
Posted by GitBox <gi...@apache.org>.
gesterzhou commented on a change in pull request #4987:
URL: https://github.com/apache/geode/pull/4987#discussion_r418993723
##########
File path: geode-core/src/main/java/org/apache/geode/internal/cache/InternalRegion.java
##########
@@ -459,4 +459,7 @@ VersionedObjectList basicRemoveAll(Collection<Object> keys,
* @return true if synchronization should be attempted
*/
boolean shouldSyncForCrashedMember(InternalDistributedMember id);
+
+ void clearRegionLocally(RegionEventImpl regionEvent, boolean cacheWrite,
Review comment:
I remove the code changes in InternalRegion, change the clearRegionLocally into public, then the code can compile.
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [geode] agingade closed pull request #4987: GEODE-7678: Support for cache-listener and client-notification for Partitioned Region Clear operation.
Posted by GitBox <gi...@apache.org>.
agingade closed pull request #4987:
URL: https://github.com/apache/geode/pull/4987
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [geode] agingade commented on a change in pull request #4987: GEODE-7678: Support for cache-listener and client-notification for Partitioned Region Clear operation.
Posted by GitBox <gi...@apache.org>.
agingade commented on a change in pull request #4987:
URL: https://github.com/apache/geode/pull/4987#discussion_r417706786
##########
File path: geode-core/src/main/java/org/apache/geode/internal/cache/ClearPartitionedRegion.java
##########
@@ -0,0 +1,379 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.geode.internal.cache;
+
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Iterator;
+
+import org.apache.logging.log4j.Logger;
+
+import org.apache.geode.CancelException;
+import org.apache.geode.cache.Operation;
+import org.apache.geode.cache.partition.PartitionRegionHelper;
+import org.apache.geode.distributed.internal.DistributionManager;
+import org.apache.geode.distributed.internal.MembershipListener;
+import org.apache.geode.distributed.internal.ReplyException;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.cache.versions.RegionVersionVector;
+import org.apache.geode.logging.internal.log4j.api.LogService;
+
+public class ClearPartitionedRegion {
+
+ private static final Logger logger = LogService.getLogger();
+
+ private final PartitionedRegion partitionedRegion;
+
+ private LockForListenerAndClientNotification lockForListenerAndClientNotification =
+ new LockForListenerAndClientNotification();
+
+ private volatile boolean membershipchange = false;
+
+ public ClearPartitionedRegion(PartitionedRegion partitionedRegion) {
+ this.partitionedRegion = partitionedRegion;
+ partitionedRegion.getDistributionManager()
+ .addMembershipListener(new ClearPartitionedRegionListener());
+ }
+
+ public boolean isLockedForListenerAndClientNotification() {
+ return lockForListenerAndClientNotification.isLocked();
+ }
+
+ void acquireDistributedClearLock(String clearLock) {
+ try {
+ partitionedRegion.getPartitionedRegionLockService().lock(clearLock, -1, -1);
+ } catch (IllegalStateException e) {
+ partitionedRegion.lockCheckReadiness();
+ throw e;
+ }
+ }
+
+ void releaseDistributedClearLock(String clearLock) {
+ try {
+ partitionedRegion.getPartitionedRegionLockService().unlock(clearLock);
+ } catch (IllegalStateException e) {
+ partitionedRegion.lockCheckReadiness();
+ } catch (Exception ex) {
+ logger.warn("Caught exception while unlocking clear distributed lock", ex.getMessage());
+ }
+ }
+
+ void obtainLockForClear(RegionEventImpl event) {
+ sendClearRegionMessage(event,
+ ClearPartitionedRegionMessage.OperationType.OP_LOCK_FOR_PR_CLEAR);
+ obtainClearLockLocal(partitionedRegion.getDistributionManager().getId());
+ }
+
+ void releaseLockForClear(RegionEventImpl event) {
+ sendClearRegionMessage(event,
+ ClearPartitionedRegionMessage.OperationType.OP_UNLOCK_FOR_PR_CLEAR);
+ releaseClearLockLocal();
+ }
+
+ void clearRegion(RegionEventImpl regionEvent, boolean cacheWrite,
+ RegionVersionVector vector) {
+ clearRegionLocal(regionEvent, cacheWrite, null);
+ sendClearRegionMessage(regionEvent,
+ ClearPartitionedRegionMessage.OperationType.OP_PR_CLEAR);
+ }
+
+ private void waitForPrimary() {
+ boolean retry;
+ int retryTime = 2 * 60 * 1000 /* partitionedRegion.getRetryTimeout() */;
Review comment:
Are you suggesting we should wait for some notification of status change. My initial thinking was that, but could not find a way to do it. Also, this is similar to other wait approach used in the Partitioned region.
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [geode] agingade commented on a change in pull request #4987: GEODE-7678: Support for cache-listener and client-notification for Partitioned Region Clear operation.
Posted by GitBox <gi...@apache.org>.
agingade commented on a change in pull request #4987:
URL: https://github.com/apache/geode/pull/4987#discussion_r425402905
##########
File path: geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionAfterClearNotificationDUnitTest.java
##########
@@ -0,0 +1,379 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.geode.internal.cache;
+
+import static java.util.concurrent.TimeUnit.SECONDS;
+import static org.apache.geode.test.dunit.rules.ClusterStartupRule.getCache;
+import static org.apache.geode.test.dunit.rules.ClusterStartupRule.getClientCache;
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.Properties;
+import java.util.concurrent.TimeoutException;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.stream.IntStream;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+
+import org.apache.geode.cache.InterestResultPolicy;
+import org.apache.geode.cache.PartitionAttributesFactory;
+import org.apache.geode.cache.Region;
+import org.apache.geode.cache.RegionEvent;
+import org.apache.geode.cache.RegionShortcut;
+import org.apache.geode.cache.client.ClientRegionShortcut;
+import org.apache.geode.cache.server.CacheServer;
+import org.apache.geode.cache.util.CacheListenerAdapter;
+import org.apache.geode.distributed.internal.ClusterDistributionManager;
+import org.apache.geode.distributed.internal.DistributionMessage;
+import org.apache.geode.distributed.internal.DistributionMessageObserver;
+import org.apache.geode.test.awaitility.GeodeAwaitility;
+import org.apache.geode.test.dunit.AsyncInvocation;
+import org.apache.geode.test.dunit.DUnitBlackboard;
+import org.apache.geode.test.dunit.SerializableCallableIF;
+import org.apache.geode.test.dunit.rules.ClientVM;
+import org.apache.geode.test.dunit.rules.ClusterStartupRule;
+import org.apache.geode.test.dunit.rules.MemberVM;
+
+public class PartitionedRegionAfterClearNotificationDUnitTest implements Serializable {
+ protected static final String REGION_NAME = "testPR";
+ protected static final int NUM_ENTRIES = 100;
+
+ protected int locatorPort;
+ protected MemberVM locator;
+ protected MemberVM dataStore1, dataStore2, dataStore3, accessor;
+ protected ClientVM client1, client2;
+
+ private static volatile DUnitBlackboard blackboard;
+
+ @Rule
+ public ClusterStartupRule cluster = new ClusterStartupRule(7);
+
+ @Before
+ public void setUp() throws Exception {
+ locator = cluster.startLocatorVM(0);
+ locatorPort = locator.getPort();
+ dataStore1 = cluster.startServerVM(1, getProperties(), locatorPort);
+ dataStore2 = cluster.startServerVM(2, getProperties(), locatorPort);
+ dataStore3 = cluster.startServerVM(3, getProperties(), locatorPort);
+ accessor = cluster.startServerVM(4, getProperties(), locatorPort);
+
+ client1 = cluster.startClientVM(5,
+ c -> c.withPoolSubscription(true).withLocatorConnection((locatorPort)));
+ client2 = cluster.startClientVM(6,
+ c -> c.withPoolSubscription(true).withLocatorConnection((locatorPort)));
+
+ dataStore1.invoke(this::initDataStore);
+ dataStore2.invoke(this::initDataStore);
+ dataStore3.invoke(this::initDataStore);
+ accessor.invoke(this::initAccessor);
+
+ getBlackboard().initBlackboard();
+ }
+
+ protected RegionShortcut getRegionShortCut() {
+ return RegionShortcut.PARTITION_REDUNDANT;
+ }
+
+ protected Properties getProperties() {
+ Properties properties = new Properties();
+ // properties.setProperty("log-level", "info");
+ return properties;
+ }
+
+ private Region getRegion(boolean isClient) {
+ if (isClient) {
+ return getClientCache().getRegion(REGION_NAME);
+ } else {
+ return getCache().getRegion(REGION_NAME);
+ }
+ }
+
+ private void verifyRegionSize(boolean isClient, int expectedNum) {
+ GeodeAwaitility.await()
+ .untilAsserted(() -> assertThat(getRegion(isClient).size()).isEqualTo(expectedNum));
+ }
+
+ private void initClientCache() {
+ Region region = getClientCache().createClientRegionFactory(ClientRegionShortcut.CACHING_PROXY)
+ .create(REGION_NAME);
+ region.registerInterestForAllKeys(InterestResultPolicy.KEYS);
+ }
+
+ private void stopServers() {
+ List<CacheServer> cacheServers = getCache().getCacheServers();
+ for (CacheServer server : cacheServers) {
+ server.stop();
+ }
+ }
+
+ private void initDataStore() {
+ getCache().createRegionFactory(getRegionShortCut())
+ .setPartitionAttributes(new PartitionAttributesFactory().setTotalNumBuckets(10).create())
+ .addCacheListener(new CountingCacheListener())
+ .create(REGION_NAME);
+ }
+
+ private void initAccessor() {
+ RegionShortcut shortcut = getRegionShortCut();
+ if (shortcut.isPersistent()) {
+ if (shortcut == RegionShortcut.PARTITION_PERSISTENT) {
+ shortcut = RegionShortcut.PARTITION;
+ } else if (shortcut == RegionShortcut.PARTITION_PERSISTENT_OVERFLOW) {
+ shortcut = RegionShortcut.PARTITION_OVERFLOW;
+ } else if (shortcut == RegionShortcut.PARTITION_REDUNDANT_PERSISTENT) {
+ shortcut = RegionShortcut.PARTITION_REDUNDANT;
+ } else if (shortcut == RegionShortcut.PARTITION_REDUNDANT_PERSISTENT_OVERFLOW) {
+ shortcut = RegionShortcut.PARTITION_REDUNDANT_OVERFLOW;
+ }
+ }
+ getCache().createRegionFactory(shortcut)
+ .setPartitionAttributes(
+ new PartitionAttributesFactory().setTotalNumBuckets(10).setLocalMaxMemory(0).create())
+ .addCacheListener(new CountingCacheListener())
+ .create(REGION_NAME);
+ }
+
+ private void feed(boolean isClient) {
+ Region region = getRegion(isClient);
+ IntStream.range(0, NUM_ENTRIES).forEach(i -> region.put(i, "value" + i));
+ }
+
+ private void verifyServerRegionSize(int expectedNum) {
+ accessor.invoke(() -> verifyRegionSize(false, expectedNum));
+ dataStore1.invoke(() -> verifyRegionSize(false, expectedNum));
+ dataStore2.invoke(() -> verifyRegionSize(false, expectedNum));
+ dataStore3.invoke(() -> verifyRegionSize(false, expectedNum));
+ }
+
+ private void verifyClientRegionSize(int expectedNum) {
+ client1.invoke(() -> verifyRegionSize(true, expectedNum));
+ client2.invoke(() -> verifyRegionSize(true, expectedNum));
+ }
+
+ private void verifyCacheListenerTriggerCount(MemberVM serverVM) {
+ SerializableCallableIF<Integer> getListenerTriggerCount = () -> {
+ CountingCacheListener countingCacheListener =
+ (CountingCacheListener) getRegion(false).getAttributes()
+ .getCacheListeners()[0];
+ return countingCacheListener.getClears();
+ };
+
+ int count = accessor.invoke(getListenerTriggerCount)
+ + dataStore1.invoke(getListenerTriggerCount)
+ + dataStore2.invoke(getListenerTriggerCount)
+ + dataStore3.invoke(getListenerTriggerCount);
+ assertThat(count).isEqualTo(4);
+
+ if (serverVM != null) {
+ assertThat(serverVM.invoke(getListenerTriggerCount)).isEqualTo(1);
+ }
+ }
+
+ @Test
+ public void invokeClearOnDataStoreAndVerifyListenerCount() {
+ accessor.invoke(() -> feed(false));
+ verifyServerRegionSize(NUM_ENTRIES);
+
+ dataStore1.invoke(() -> getRegion(false).clear());
+
+ verifyServerRegionSize(0);
+ verifyCacheListenerTriggerCount(dataStore1);
+ }
+
+ @Test
+ public void invokeClearOnAccessorAndVerifyListenerCount() {
+ accessor.invoke(() -> feed(false));
+ verifyServerRegionSize(NUM_ENTRIES);
+ accessor.invoke(() -> getRegion(false).clear());
+ verifyServerRegionSize(0);
+ verifyCacheListenerTriggerCount(accessor);
+ }
+
+ @Test
+ public void invokeClearFromClientAndVerifyListenerCount() {
+ client1.invoke(this::initClientCache);
+ client2.invoke(this::initClientCache);
+
+ client1.invoke(() -> feed(true));
+ verifyClientRegionSize(NUM_ENTRIES);
+ verifyServerRegionSize(NUM_ENTRIES);
+
+ client1.invoke(() -> getRegion(true).clear());
+
+ verifyServerRegionSize(0);
+ verifyClientRegionSize(0);
+ verifyCacheListenerTriggerCount(null);
+ }
+
+ @Test
+ public void invokeClearFromClientWithAccessorAsServer() {
+ dataStore1.invoke(this::stopServers);
Review comment:
This is to make sure clients only connect to accessor and not any other server. And to force client HAQueue to be created on accessor.
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [geode] gesterzhou commented on a change in pull request #4987: GEODE-7678: Support for cache-listener and client-notification for Partitioned Region Clear operation.
Posted by GitBox <gi...@apache.org>.
gesterzhou commented on a change in pull request #4987:
URL: https://github.com/apache/geode/pull/4987#discussion_r414132510
##########
File path: geode-core/src/main/java/org/apache/geode/internal/cache/ClearPartitionedRegion.java
##########
@@ -0,0 +1,342 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.geode.internal.cache;
+
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Iterator;
+
+import org.apache.logging.log4j.Logger;
+
+import org.apache.geode.CancelException;
+import org.apache.geode.cache.Operation;
+import org.apache.geode.cache.partition.PartitionRegionHelper;
+import org.apache.geode.distributed.internal.DistributionManager;
+import org.apache.geode.distributed.internal.MembershipListener;
+import org.apache.geode.distributed.internal.ReplyException;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.cache.versions.RegionVersionVector;
+import org.apache.geode.logging.internal.log4j.api.LogService;
+
+public class ClearPartitionedRegion {
+
+ private static final Logger logger = LogService.getLogger();
+
+ private final PartitionedRegion partitionedRegion;
+
+ private LockForListenerAndClientNotification lockForListenerAndClientNotification =
+ new LockForListenerAndClientNotification();
+
+ public ClearPartitionedRegion(PartitionedRegion partitionedRegion) {
+ this.partitionedRegion = partitionedRegion;
+ partitionedRegion.getDistributionManager()
+ .addMembershipListener(new ClearPartitionedRegionListener());
+ }
+
+ public boolean isLockedForListenerAndClientNotification() {
+ return lockForListenerAndClientNotification.isLocked();
+ }
+
+ void acquireDistributedClearLock(String clearLock) {
+ try {
+ partitionedRegion.getPartitionedRegionLockService().lock(clearLock, -1, -1);
+ } catch (IllegalStateException e) {
+ partitionedRegion.lockCheckReadiness();
+ throw e;
+ }
+ }
+
+ void releaseDistributedClearLock(String clearLock) {
+ try {
+ partitionedRegion.getPartitionedRegionLockService().unlock(clearLock);
+ } catch (IllegalStateException e) {
+ partitionedRegion.lockCheckReadiness();
+ } catch (Exception ex) {
+ logger.warn("Caught exception while unlocking clear distributed lock", ex.getMessage());
+ }
+ }
+
+ void obtainWriteLockForClear(RegionEventImpl event) {
+ sendLocalClearRegionMessage(event,
+ ClearPartitionedRegionMessage.OperationType.OP_LOCK_FOR_CLEAR);
+ obtainClearLockLocal(partitionedRegion.getDistributionManager().getId());
+ }
+
+ void releaseWriteLockForClear(RegionEventImpl event) {
+ sendLocalClearRegionMessage(event,
+ ClearPartitionedRegionMessage.OperationType.OP_UNLOCK_FOR_CLEAR);
+ releaseClearLockLocal();
+ }
+
+ void clearRegion(RegionEventImpl regionEvent, boolean cacheWrite,
+ RegionVersionVector vector) {
+ clearRegionLocal(regionEvent, cacheWrite, null);
+ sendLocalClearRegionMessage(regionEvent,
+ ClearPartitionedRegionMessage.OperationType.OP_CLEAR);
+ }
+
+ public void clearRegionLocal(RegionEventImpl regionEvent, boolean cacheWrite,
+ RegionVersionVector vector) {
+ // Synchronized to handle the requester departure.
+ synchronized (lockForListenerAndClientNotification) {
Review comment:
Do you need to sync here again while you have synchronized (clearLock) in PR?
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [geode] lgtm-com[bot] commented on pull request #4987: GEODE-7678: Support for cache-listener and client-notification for Partitioned Region Clear operation.
Posted by GitBox <gi...@apache.org>.
lgtm-com[bot] commented on pull request #4987:
URL: https://github.com/apache/geode/pull/4987#issuecomment-618684185
This pull request **introduces 1 alert** when merging 65cdf021720690a0e5274cb10d5833c512f31cfe into e87b3b7ab7cb48d2a4be9b114443dda56bfd9d70 - [view on LGTM.com](https://lgtm.com/projects/g/apache/geode/rev/pr-b3ed1961faa0ce57c9695f210a8d7b61326c24e8)
**new alerts:**
* 1 for Non\-synchronized override of synchronized method
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [geode] agingade commented on a change in pull request #4987: GEODE-7678: Support for cache-listener and client-notification for Partitioned Region Clear operation.
Posted by GitBox <gi...@apache.org>.
agingade commented on a change in pull request #4987:
URL: https://github.com/apache/geode/pull/4987#discussion_r419174220
##########
File path: geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegionClear.java
##########
@@ -30,18 +31,22 @@
import org.apache.geode.internal.cache.versions.RegionVersionVector;
import org.apache.geode.logging.internal.log4j.api.LogService;
-public class ClearPartitionedRegion {
+public class PartitionedRegionClear {
private static final Logger logger = LogService.getLogger();
+ private static final String CLEAR_OPERATION = "_clearOperation";
+
+ private final int retryTime = 2 * 60 * 1000 /* partitionedRegion.getRetryTimeout() */;
Review comment:
The "partitionedRegion.getRetryTimeout()" is an hour long. In clear operation case, it is too long to wait for, Instead we throw partial clear exception and allow user to take decision on retry or ignore partial data clear.
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [geode] gesterzhou commented on a change in pull request #4987: GEODE-7678: Support for cache-listener and client-notification for Partitioned Region Clear operation.
Posted by GitBox <gi...@apache.org>.
gesterzhou commented on a change in pull request #4987:
URL: https://github.com/apache/geode/pull/4987#discussion_r414754247
##########
File path: geode-core/src/main/java/org/apache/geode/internal/cache/ClearPartitionedRegion.java
##########
@@ -0,0 +1,347 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.geode.internal.cache;
+
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Iterator;
+
+import org.apache.logging.log4j.Logger;
+
+import org.apache.geode.CancelException;
+import org.apache.geode.cache.Operation;
+import org.apache.geode.cache.partition.PartitionRegionHelper;
+import org.apache.geode.distributed.internal.DistributionManager;
+import org.apache.geode.distributed.internal.MembershipListener;
+import org.apache.geode.distributed.internal.ReplyException;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.cache.versions.RegionVersionVector;
+import org.apache.geode.logging.internal.log4j.api.LogService;
+
+public class ClearPartitionedRegion {
+
+ private static final Logger logger = LogService.getLogger();
+
+ private final PartitionedRegion partitionedRegion;
+
+ private LockForListenerAndClientNotification lockForListenerAndClientNotification =
+ new LockForListenerAndClientNotification();
+
+ public ClearPartitionedRegion(PartitionedRegion partitionedRegion) {
+ this.partitionedRegion = partitionedRegion;
+ partitionedRegion.getDistributionManager()
+ .addMembershipListener(new ClearPartitionedRegionListener());
+ }
+
+ public boolean isLockedForListenerAndClientNotification() {
+ return lockForListenerAndClientNotification.isLocked();
+ }
+
+ void acquireDistributedClearLock(String clearLock) {
+ try {
+ partitionedRegion.getPartitionedRegionLockService().lock(clearLock, -1, -1);
+ } catch (IllegalStateException e) {
+ partitionedRegion.lockCheckReadiness();
+ throw e;
+ }
+ }
+
+ void releaseDistributedClearLock(String clearLock) {
+ try {
+ partitionedRegion.getPartitionedRegionLockService().unlock(clearLock);
+ } catch (IllegalStateException e) {
+ partitionedRegion.lockCheckReadiness();
+ } catch (Exception ex) {
+ logger.warn("Caught exception while unlocking clear distributed lock", ex.getMessage());
+ }
+ }
+
+ void obtainWriteLockForClear(RegionEventImpl event) {
+ sendLocalClearRegionMessage(event,
Review comment:
sendLocalClearRegionMessage() created a message whose operation is ClearPartitionedRegionMessage.OperationType.OP_LOCK_FOR_CLEAR, but the event's operation
is Operation.REGION_LOCAL_CLEAR. It's confusing here. Actually this message is not "local clear", it's only "lock for pr clear (locally)".
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [geode] agingade commented on a change in pull request #4987: GEODE-7678: Support for cache-listener and client-notification for Partitioned Region Clear operation.
Posted by GitBox <gi...@apache.org>.
agingade commented on a change in pull request #4987:
URL: https://github.com/apache/geode/pull/4987#discussion_r426080859
##########
File path: geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionAfterClearNotificationDUnitTest.java
##########
@@ -0,0 +1,379 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.geode.internal.cache;
+
+import static java.util.concurrent.TimeUnit.SECONDS;
+import static org.apache.geode.test.dunit.rules.ClusterStartupRule.getCache;
+import static org.apache.geode.test.dunit.rules.ClusterStartupRule.getClientCache;
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.Properties;
+import java.util.concurrent.TimeoutException;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.stream.IntStream;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+
+import org.apache.geode.cache.InterestResultPolicy;
+import org.apache.geode.cache.PartitionAttributesFactory;
+import org.apache.geode.cache.Region;
+import org.apache.geode.cache.RegionEvent;
+import org.apache.geode.cache.RegionShortcut;
+import org.apache.geode.cache.client.ClientRegionShortcut;
+import org.apache.geode.cache.server.CacheServer;
+import org.apache.geode.cache.util.CacheListenerAdapter;
+import org.apache.geode.distributed.internal.ClusterDistributionManager;
+import org.apache.geode.distributed.internal.DistributionMessage;
+import org.apache.geode.distributed.internal.DistributionMessageObserver;
+import org.apache.geode.test.awaitility.GeodeAwaitility;
+import org.apache.geode.test.dunit.AsyncInvocation;
+import org.apache.geode.test.dunit.DUnitBlackboard;
+import org.apache.geode.test.dunit.SerializableCallableIF;
+import org.apache.geode.test.dunit.rules.ClientVM;
+import org.apache.geode.test.dunit.rules.ClusterStartupRule;
+import org.apache.geode.test.dunit.rules.MemberVM;
+
+public class PartitionedRegionAfterClearNotificationDUnitTest implements Serializable {
+ protected static final String REGION_NAME = "testPR";
+ protected static final int NUM_ENTRIES = 100;
+
+ protected int locatorPort;
+ protected MemberVM locator;
+ protected MemberVM dataStore1, dataStore2, dataStore3, accessor;
+ protected ClientVM client1, client2;
+
+ private static volatile DUnitBlackboard blackboard;
+
+ @Rule
+ public ClusterStartupRule cluster = new ClusterStartupRule(7);
+
+ @Before
+ public void setUp() throws Exception {
+ locator = cluster.startLocatorVM(0);
+ locatorPort = locator.getPort();
+ dataStore1 = cluster.startServerVM(1, getProperties(), locatorPort);
+ dataStore2 = cluster.startServerVM(2, getProperties(), locatorPort);
+ dataStore3 = cluster.startServerVM(3, getProperties(), locatorPort);
+ accessor = cluster.startServerVM(4, getProperties(), locatorPort);
+
+ client1 = cluster.startClientVM(5,
+ c -> c.withPoolSubscription(true).withLocatorConnection((locatorPort)));
+ client2 = cluster.startClientVM(6,
+ c -> c.withPoolSubscription(true).withLocatorConnection((locatorPort)));
+
+ dataStore1.invoke(this::initDataStore);
+ dataStore2.invoke(this::initDataStore);
+ dataStore3.invoke(this::initDataStore);
+ accessor.invoke(this::initAccessor);
+
+ getBlackboard().initBlackboard();
+ }
+
+ protected RegionShortcut getRegionShortCut() {
+ return RegionShortcut.PARTITION_REDUNDANT;
+ }
+
+ protected Properties getProperties() {
+ Properties properties = new Properties();
+ // properties.setProperty("log-level", "info");
+ return properties;
+ }
+
+ private Region getRegion(boolean isClient) {
+ if (isClient) {
+ return getClientCache().getRegion(REGION_NAME);
+ } else {
+ return getCache().getRegion(REGION_NAME);
+ }
+ }
+
+ private void verifyRegionSize(boolean isClient, int expectedNum) {
+ GeodeAwaitility.await()
+ .untilAsserted(() -> assertThat(getRegion(isClient).size()).isEqualTo(expectedNum));
+ }
+
+ private void initClientCache() {
+ Region region = getClientCache().createClientRegionFactory(ClientRegionShortcut.CACHING_PROXY)
+ .create(REGION_NAME);
+ region.registerInterestForAllKeys(InterestResultPolicy.KEYS);
+ }
+
+ private void stopServers() {
+ List<CacheServer> cacheServers = getCache().getCacheServers();
+ for (CacheServer server : cacheServers) {
+ server.stop();
+ }
+ }
+
+ private void initDataStore() {
+ getCache().createRegionFactory(getRegionShortCut())
+ .setPartitionAttributes(new PartitionAttributesFactory().setTotalNumBuckets(10).create())
+ .addCacheListener(new CountingCacheListener())
+ .create(REGION_NAME);
+ }
+
+ private void initAccessor() {
+ RegionShortcut shortcut = getRegionShortCut();
+ if (shortcut.isPersistent()) {
+ if (shortcut == RegionShortcut.PARTITION_PERSISTENT) {
+ shortcut = RegionShortcut.PARTITION;
+ } else if (shortcut == RegionShortcut.PARTITION_PERSISTENT_OVERFLOW) {
+ shortcut = RegionShortcut.PARTITION_OVERFLOW;
+ } else if (shortcut == RegionShortcut.PARTITION_REDUNDANT_PERSISTENT) {
+ shortcut = RegionShortcut.PARTITION_REDUNDANT;
+ } else if (shortcut == RegionShortcut.PARTITION_REDUNDANT_PERSISTENT_OVERFLOW) {
+ shortcut = RegionShortcut.PARTITION_REDUNDANT_OVERFLOW;
+ }
+ }
Review comment:
Good catch :)
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [geode] agingade commented on a change in pull request #4987: GEODE-7678: Support for cache-listener and client-notification for Partitioned Region Clear operation.
Posted by GitBox <gi...@apache.org>.
agingade commented on a change in pull request #4987:
URL: https://github.com/apache/geode/pull/4987#discussion_r425409860
##########
File path: geode-core/src/distributedTest/java/org/apache/geode/cache/ReplicateCacheListenerDistributedTest.java
##########
@@ -283,7 +325,12 @@ public void afterInvalidate(final EntryEvent<String, Integer> event) {
@Override
public void afterCreate(final EntryEvent<String, Integer> event) {
- // ignore
+ sharedCountersRule.increment(CREATES);
Review comment:
This is to override the unsupported exception in base cache listener.
##########
File path: geode-core/src/distributedTest/java/org/apache/geode/cache/ReplicateCacheListenerDistributedTest.java
##########
@@ -283,7 +325,12 @@ public void afterInvalidate(final EntryEvent<String, Integer> event) {
@Override
public void afterCreate(final EntryEvent<String, Integer> event) {
- // ignore
+ sharedCountersRule.increment(CREATES);
+ }
+
+ @Override
+ public void afterUpdate(final EntryEvent<String, Integer> event) {
+ sharedCountersRule.increment(UPDATES);
Review comment:
This is to override the unsupported exception in base cache listener.
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [geode] agingade commented on a change in pull request #4987: GEODE-7678: Support for cache-listener and client-notification for Partitioned Region Clear operation.
Posted by GitBox <gi...@apache.org>.
agingade commented on a change in pull request #4987:
URL: https://github.com/apache/geode/pull/4987#discussion_r426081013
##########
File path: geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionClearDUnitTest.java
##########
@@ -0,0 +1,400 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.geode.internal.cache;
+
+import static org.apache.geode.internal.Assert.fail;
+import static org.apache.geode.test.dunit.rules.ClusterStartupRule.getCache;
+import static org.apache.geode.test.dunit.rules.ClusterStartupRule.getClientCache;
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Properties;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.stream.IntStream;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+
+import org.apache.geode.cache.CacheWriterException;
+import org.apache.geode.cache.InterestResultPolicy;
+import org.apache.geode.cache.PartitionAttributesFactory;
+import org.apache.geode.cache.Region;
+import org.apache.geode.cache.RegionEvent;
+import org.apache.geode.cache.RegionFactory;
+import org.apache.geode.cache.RegionShortcut;
+import org.apache.geode.cache.client.ClientRegionShortcut;
+import org.apache.geode.cache.util.CacheWriterAdapter;
+import org.apache.geode.test.dunit.SerializableCallableIF;
+import org.apache.geode.test.dunit.rules.ClientVM;
+import org.apache.geode.test.dunit.rules.ClusterStartupRule;
+import org.apache.geode.test.dunit.rules.MemberVM;
+
+public class PartitionedRegionClearDUnitTest implements Serializable {
+ protected static final String REGION_NAME = "testPR";
+ protected static final int TOTAL_BUCKET_NUM = 10;
+ protected static final int NUM_ENTRIES = 1000;
+
+ protected int locatorPort;
+ protected MemberVM locator;
+ protected MemberVM dataStore1, dataStore2, dataStore3, accessor;
+ protected ClientVM client1, client2;
Review comment:
Got the same comment from Jinxia...Fixed in the new checkin.
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [geode] gesterzhou commented on a change in pull request #4987: GEODE-7678: Support for cache-listener and client-notification for Partitioned Region Clear operation.
Posted by GitBox <gi...@apache.org>.
gesterzhou commented on a change in pull request #4987:
URL: https://github.com/apache/geode/pull/4987#discussion_r414036147
##########
File path: geode-core/src/main/java/org/apache/geode/internal/cache/ClearPartitionedRegion.java
##########
@@ -0,0 +1,342 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.geode.internal.cache;
+
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Iterator;
+
+import org.apache.logging.log4j.Logger;
+
+import org.apache.geode.CancelException;
+import org.apache.geode.cache.Operation;
+import org.apache.geode.cache.partition.PartitionRegionHelper;
+import org.apache.geode.distributed.internal.DistributionManager;
+import org.apache.geode.distributed.internal.MembershipListener;
+import org.apache.geode.distributed.internal.ReplyException;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.cache.versions.RegionVersionVector;
+import org.apache.geode.logging.internal.log4j.api.LogService;
+
+public class ClearPartitionedRegion {
+
+ private static final Logger logger = LogService.getLogger();
+
+ private final PartitionedRegion partitionedRegion;
+
+ private LockForListenerAndClientNotification lockForListenerAndClientNotification =
+ new LockForListenerAndClientNotification();
+
+ public ClearPartitionedRegion(PartitionedRegion partitionedRegion) {
+ this.partitionedRegion = partitionedRegion;
+ partitionedRegion.getDistributionManager()
+ .addMembershipListener(new ClearPartitionedRegionListener());
+ }
+
+ public boolean isLockedForListenerAndClientNotification() {
+ return lockForListenerAndClientNotification.isLocked();
+ }
+
+ void acquireDistributedClearLock(String clearLock) {
+ try {
+ partitionedRegion.getPartitionedRegionLockService().lock(clearLock, -1, -1);
+ } catch (IllegalStateException e) {
+ partitionedRegion.lockCheckReadiness();
+ throw e;
+ }
+ }
+
+ void releaseDistributedClearLock(String clearLock) {
+ try {
+ partitionedRegion.getPartitionedRegionLockService().unlock(clearLock);
+ } catch (IllegalStateException e) {
+ partitionedRegion.lockCheckReadiness();
+ } catch (Exception ex) {
+ logger.warn("Caught exception while unlocking clear distributed lock", ex.getMessage());
+ }
+ }
+
+ void obtainWriteLockForClear(RegionEventImpl event) {
+ sendLocalClearRegionMessage(event,
+ ClearPartitionedRegionMessage.OperationType.OP_LOCK_FOR_CLEAR);
Review comment:
It's better to use OP_LOCK_FOR_PR_CLEAR, OP_UNLOCK_FOR_PR_CLEAR.
The OP_LOCK_FOR_CLEAR is used for DistributedRegion's CLEAR. Don't mix the operation type name.
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [geode] gesterzhou commented on a change in pull request #4987: GEODE-7678: Support for cache-listener and client-notification for Partitioned Region Clear operation.
Posted by GitBox <gi...@apache.org>.
gesterzhou commented on a change in pull request #4987:
URL: https://github.com/apache/geode/pull/4987#discussion_r416821768
##########
File path: geode-core/src/main/java/org/apache/geode/internal/cache/ClearPartitionedRegion.java
##########
@@ -0,0 +1,342 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.geode.internal.cache;
+
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Iterator;
+
+import org.apache.logging.log4j.Logger;
+
+import org.apache.geode.CancelException;
+import org.apache.geode.cache.Operation;
+import org.apache.geode.cache.partition.PartitionRegionHelper;
+import org.apache.geode.distributed.internal.DistributionManager;
+import org.apache.geode.distributed.internal.MembershipListener;
+import org.apache.geode.distributed.internal.ReplyException;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.cache.versions.RegionVersionVector;
+import org.apache.geode.logging.internal.log4j.api.LogService;
+
+public class ClearPartitionedRegion {
+
+ private static final Logger logger = LogService.getLogger();
+
+ private final PartitionedRegion partitionedRegion;
+
+ private LockForListenerAndClientNotification lockForListenerAndClientNotification =
+ new LockForListenerAndClientNotification();
+
+ public ClearPartitionedRegion(PartitionedRegion partitionedRegion) {
+ this.partitionedRegion = partitionedRegion;
+ partitionedRegion.getDistributionManager()
+ .addMembershipListener(new ClearPartitionedRegionListener());
+ }
+
+ public boolean isLockedForListenerAndClientNotification() {
+ return lockForListenerAndClientNotification.isLocked();
+ }
+
+ void acquireDistributedClearLock(String clearLock) {
+ try {
+ partitionedRegion.getPartitionedRegionLockService().lock(clearLock, -1, -1);
+ } catch (IllegalStateException e) {
+ partitionedRegion.lockCheckReadiness();
+ throw e;
+ }
+ }
+
+ void releaseDistributedClearLock(String clearLock) {
+ try {
+ partitionedRegion.getPartitionedRegionLockService().unlock(clearLock);
+ } catch (IllegalStateException e) {
+ partitionedRegion.lockCheckReadiness();
+ } catch (Exception ex) {
+ logger.warn("Caught exception while unlocking clear distributed lock", ex.getMessage());
+ }
+ }
+
+ void obtainWriteLockForClear(RegionEventImpl event) {
+ sendLocalClearRegionMessage(event,
+ ClearPartitionedRegionMessage.OperationType.OP_LOCK_FOR_CLEAR);
+ obtainClearLockLocal(partitionedRegion.getDistributionManager().getId());
Review comment:
I still think to do local lock, local clear, local release first, then send the message, especially current local clear is before sending mesg.
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [geode] mhansonp closed pull request #4987: GEODE-7678: Support for cache-listener and client-notification for Partitioned Region Clear operation.
Posted by GitBox <gi...@apache.org>.
mhansonp closed pull request #4987:
URL: https://github.com/apache/geode/pull/4987
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [geode] agingade commented on a change in pull request #4987: GEODE-7678: Support for cache-listener and client-notification for Partitioned Region Clear operation.
Posted by GitBox <gi...@apache.org>.
agingade commented on a change in pull request #4987:
URL: https://github.com/apache/geode/pull/4987#discussion_r425397451
##########
File path: geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegion.java
##########
@@ -10373,4 +10377,27 @@ void updatePartitionRegionConfig(
public SenderIdMonitor getSenderIdMonitor() {
return senderIdMonitor;
}
+
+ protected ClearPartitionedRegion getClearPartitionedRegion() {
+ return clearPartitionedRegion;
+ }
+
+ @Override
+ void cmnClearRegion(RegionEventImpl regionEvent, boolean cacheWrite, boolean useRVV) {
+ // Synchronized to avoid other threads invoking clear on this vm/node.
+ synchronized (clearLock) {
+ clearPartitionedRegion.doClear(regionEvent, cacheWrite, this);
Review comment:
We have ticket/story for transaction and PR.clear. Lets revisit this as part of that story.
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [geode] gesterzhou commented on a change in pull request #4987: GEODE-7678: Support for cache-listener and client-notification for Partitioned Region Clear operation.
Posted by GitBox <gi...@apache.org>.
gesterzhou commented on a change in pull request #4987:
URL: https://github.com/apache/geode/pull/4987#discussion_r414745741
##########
File path: geode-core/src/main/java/org/apache/geode/internal/cache/ClearPartitionedRegion.java
##########
@@ -0,0 +1,347 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.geode.internal.cache;
+
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Iterator;
+
+import org.apache.logging.log4j.Logger;
+
+import org.apache.geode.CancelException;
+import org.apache.geode.cache.Operation;
+import org.apache.geode.cache.partition.PartitionRegionHelper;
+import org.apache.geode.distributed.internal.DistributionManager;
+import org.apache.geode.distributed.internal.MembershipListener;
+import org.apache.geode.distributed.internal.ReplyException;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.cache.versions.RegionVersionVector;
+import org.apache.geode.logging.internal.log4j.api.LogService;
+
+public class ClearPartitionedRegion {
+
+ private static final Logger logger = LogService.getLogger();
+
+ private final PartitionedRegion partitionedRegion;
+
+ private LockForListenerAndClientNotification lockForListenerAndClientNotification =
+ new LockForListenerAndClientNotification();
+
+ public ClearPartitionedRegion(PartitionedRegion partitionedRegion) {
+ this.partitionedRegion = partitionedRegion;
+ partitionedRegion.getDistributionManager()
+ .addMembershipListener(new ClearPartitionedRegionListener());
+ }
+
+ public boolean isLockedForListenerAndClientNotification() {
+ return lockForListenerAndClientNotification.isLocked();
+ }
+
+ void acquireDistributedClearLock(String clearLock) {
+ try {
+ partitionedRegion.getPartitionedRegionLockService().lock(clearLock, -1, -1);
+ } catch (IllegalStateException e) {
+ partitionedRegion.lockCheckReadiness();
+ throw e;
+ }
+ }
+
+ void releaseDistributedClearLock(String clearLock) {
+ try {
+ partitionedRegion.getPartitionedRegionLockService().unlock(clearLock);
+ } catch (IllegalStateException e) {
+ partitionedRegion.lockCheckReadiness();
+ } catch (Exception ex) {
+ logger.warn("Caught exception while unlocking clear distributed lock", ex.getMessage());
+ }
+ }
+
+ void obtainWriteLockForClear(RegionEventImpl event) {
+ sendLocalClearRegionMessage(event,
Review comment:
Since the message is to let other member lock rvv and prepare for clear. The "sendLocalClearRegionMessage" is better to be rename to sendLockForClearPRMessage
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [geode] gesterzhou commented on a change in pull request #4987: GEODE-7678: Support for cache-listener and client-notification for Partitioned Region Clear operation.
Posted by GitBox <gi...@apache.org>.
gesterzhou commented on a change in pull request #4987:
URL: https://github.com/apache/geode/pull/4987#discussion_r418992945
##########
File path: geode-core/src/main/java/org/apache/geode/internal/cache/InternalRegion.java
##########
@@ -459,4 +459,7 @@ VersionedObjectList basicRemoveAll(Collection<Object> keys,
* @return true if synchronization should be attempted
*/
boolean shouldSyncForCrashedMember(InternalDistributedMember id);
+
+ void clearRegionLocally(RegionEventImpl regionEvent, boolean cacheWrite,
Review comment:
I wonder if we should change the API here? Will that impact our backward compatibility?
Do we have workaround not to change InternalRegion.java?
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [geode] lgtm-com[bot] commented on issue #4987: GEODE-7678: Support for cache-listener and client-notification for Partitioned Region Clear operation.
Posted by GitBox <gi...@apache.org>.
lgtm-com[bot] commented on issue #4987:
URL: https://github.com/apache/geode/pull/4987#issuecomment-618094081
This pull request **introduces 1 alert** when merging 90928f3c68edbb010f103755a9279e5067fbafe5 into e87b3b7ab7cb48d2a4be9b114443dda56bfd9d70 - [view on LGTM.com](https://lgtm.com/projects/g/apache/geode/rev/pr-8301776a6101a07aedfd1e855dfb524329ff556c)
**new alerts:**
* 1 for Non\-synchronized override of synchronized method
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [geode] gesterzhou commented on a change in pull request #4987: GEODE-7678: Support for cache-listener and client-notification for Partitioned Region Clear operation.
Posted by GitBox <gi...@apache.org>.
gesterzhou commented on a change in pull request #4987:
URL: https://github.com/apache/geode/pull/4987#discussion_r414037932
##########
File path: geode-core/src/main/java/org/apache/geode/internal/cache/ClearPartitionedRegion.java
##########
@@ -0,0 +1,342 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.geode.internal.cache;
+
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Iterator;
+
+import org.apache.logging.log4j.Logger;
+
+import org.apache.geode.CancelException;
+import org.apache.geode.cache.Operation;
+import org.apache.geode.cache.partition.PartitionRegionHelper;
+import org.apache.geode.distributed.internal.DistributionManager;
+import org.apache.geode.distributed.internal.MembershipListener;
+import org.apache.geode.distributed.internal.ReplyException;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.cache.versions.RegionVersionVector;
+import org.apache.geode.logging.internal.log4j.api.LogService;
+
+public class ClearPartitionedRegion {
+
+ private static final Logger logger = LogService.getLogger();
+
+ private final PartitionedRegion partitionedRegion;
+
+ private LockForListenerAndClientNotification lockForListenerAndClientNotification =
+ new LockForListenerAndClientNotification();
+
+ public ClearPartitionedRegion(PartitionedRegion partitionedRegion) {
+ this.partitionedRegion = partitionedRegion;
+ partitionedRegion.getDistributionManager()
+ .addMembershipListener(new ClearPartitionedRegionListener());
+ }
+
+ public boolean isLockedForListenerAndClientNotification() {
+ return lockForListenerAndClientNotification.isLocked();
+ }
+
+ void acquireDistributedClearLock(String clearLock) {
+ try {
+ partitionedRegion.getPartitionedRegionLockService().lock(clearLock, -1, -1);
+ } catch (IllegalStateException e) {
+ partitionedRegion.lockCheckReadiness();
+ throw e;
+ }
+ }
+
+ void releaseDistributedClearLock(String clearLock) {
+ try {
+ partitionedRegion.getPartitionedRegionLockService().unlock(clearLock);
+ } catch (IllegalStateException e) {
+ partitionedRegion.lockCheckReadiness();
+ } catch (Exception ex) {
+ logger.warn("Caught exception while unlocking clear distributed lock", ex.getMessage());
+ }
+ }
+
+ void obtainWriteLockForClear(RegionEventImpl event) {
+ sendLocalClearRegionMessage(event,
+ ClearPartitionedRegionMessage.OperationType.OP_LOCK_FOR_CLEAR);
+ obtainClearLockLocal(partitionedRegion.getDistributionManager().getId());
Review comment:
Should we do local lock first, then distribute the message to other members? The replicated region's clear is using this sequence. I think it's better to follow the same sequence, unless we have special reason.
Same thing for releaseWriteLockForClear.
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [geode] agingade commented on a change in pull request #4987: GEODE-7678: Support for cache-listener and client-notification for Partitioned Region Clear operation.
Posted by GitBox <gi...@apache.org>.
agingade commented on a change in pull request #4987:
URL: https://github.com/apache/geode/pull/4987#discussion_r419192151
##########
File path: geode-core/src/main/java/org/apache/geode/internal/cache/ClearPartitionedRegion.java
##########
@@ -0,0 +1,379 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.geode.internal.cache;
+
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Iterator;
+
+import org.apache.logging.log4j.Logger;
+
+import org.apache.geode.CancelException;
+import org.apache.geode.cache.Operation;
+import org.apache.geode.cache.partition.PartitionRegionHelper;
+import org.apache.geode.distributed.internal.DistributionManager;
+import org.apache.geode.distributed.internal.MembershipListener;
+import org.apache.geode.distributed.internal.ReplyException;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.cache.versions.RegionVersionVector;
+import org.apache.geode.logging.internal.log4j.api.LogService;
+
+public class ClearPartitionedRegion {
+
+ private static final Logger logger = LogService.getLogger();
+
+ private final PartitionedRegion partitionedRegion;
+
+ private LockForListenerAndClientNotification lockForListenerAndClientNotification =
+ new LockForListenerAndClientNotification();
+
+ private volatile boolean membershipchange = false;
+
+ public ClearPartitionedRegion(PartitionedRegion partitionedRegion) {
+ this.partitionedRegion = partitionedRegion;
+ partitionedRegion.getDistributionManager()
+ .addMembershipListener(new ClearPartitionedRegionListener());
+ }
+
+ public boolean isLockedForListenerAndClientNotification() {
+ return lockForListenerAndClientNotification.isLocked();
+ }
+
+ void acquireDistributedClearLock(String clearLock) {
+ try {
+ partitionedRegion.getPartitionedRegionLockService().lock(clearLock, -1, -1);
+ } catch (IllegalStateException e) {
+ partitionedRegion.lockCheckReadiness();
+ throw e;
+ }
+ }
+
+ void releaseDistributedClearLock(String clearLock) {
+ try {
+ partitionedRegion.getPartitionedRegionLockService().unlock(clearLock);
+ } catch (IllegalStateException e) {
+ partitionedRegion.lockCheckReadiness();
+ } catch (Exception ex) {
+ logger.warn("Caught exception while unlocking clear distributed lock", ex.getMessage());
+ }
+ }
+
+ void obtainLockForClear(RegionEventImpl event) {
+ sendClearRegionMessage(event,
+ ClearPartitionedRegionMessage.OperationType.OP_LOCK_FOR_PR_CLEAR);
+ obtainClearLockLocal(partitionedRegion.getDistributionManager().getId());
+ }
+
+ void releaseLockForClear(RegionEventImpl event) {
+ sendClearRegionMessage(event,
+ ClearPartitionedRegionMessage.OperationType.OP_UNLOCK_FOR_PR_CLEAR);
+ releaseClearLockLocal();
+ }
+
+ void clearRegion(RegionEventImpl regionEvent, boolean cacheWrite,
+ RegionVersionVector vector) {
+ clearRegionLocal(regionEvent, cacheWrite, null);
+ sendClearRegionMessage(regionEvent,
+ ClearPartitionedRegionMessage.OperationType.OP_PR_CLEAR);
+ }
+
+ private void waitForPrimary() {
+ boolean retry;
+ int retryTime = 2 * 60 * 1000 /* partitionedRegion.getRetryTimeout() */;
+ PartitionedRegion.RetryTimeKeeper retryTimer = new PartitionedRegion.RetryTimeKeeper(retryTime);
+ do {
+ retry = false;
+ for (BucketRegion bucketRegion : partitionedRegion.getDataStore()
+ .getAllLocalBucketRegions()) {
+ if (!bucketRegion.getBucketAdvisor().hasPrimary()) {
+ if (retryTimer.overMaximum()) {
+ PRHARedundancyProvider.timedOut(partitionedRegion, null, null,
+ "do clear. Missing primary bucket",
+ retryTime);
+ }
+ retryTimer.waitForBucketsRecovery();
+ retry = true;
+ }
+ }
+ } while (retry);
+ }
+
+ public void clearRegionLocal(RegionEventImpl regionEvent, boolean cacheWrite,
+ RegionVersionVector vector) {
+ // Synchronized to handle the requester departure.
+ synchronized (lockForListenerAndClientNotification) {
+ if (partitionedRegion.getDataStore() != null) {
+ partitionedRegion.getDataStore().lockBucketCreationForRegionClear();
+ try {
+ boolean retry;
+ do {
+ retry = false;
+ for (BucketRegion localPrimaryBucketRegion : partitionedRegion.getDataStore()
+ .getAllLocalPrimaryBucketRegions()) {
+ if (localPrimaryBucketRegion.size() > 0) {
+ localPrimaryBucketRegion.clear();
+ }
+ }
+ if (membershipchange) {
+ membershipchange = false;
+ retry = true;
+ waitForPrimary();
+ }
+ } while (retry);
+
+ doAfterClear(regionEvent);
+ } finally {
+ partitionedRegion.getDataStore().unLockBucketCreationForRegionClear();
+ }
+ } else {
+ // Non data-store with client queue and listener
+ doAfterClear(regionEvent);
+ }
+ }
+ }
Review comment:
In the if case, it is done under lock. If its moved out of there, it will be executed outside the lock.
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [geode] agingade commented on a change in pull request #4987: GEODE-7678: Support for cache-listener and client-notification for Partitioned Region Clear operation.
Posted by GitBox <gi...@apache.org>.
agingade commented on a change in pull request #4987:
URL: https://github.com/apache/geode/pull/4987#discussion_r425403916
##########
File path: geode-core/src/distributedTest/java/org/apache/geode/cache/PRCacheListenerDistributedTest.java
##########
@@ -79,4 +118,206 @@ protected int expectedInvalidates() {
protected int expectedDestroys() {
return 1;
}
+
+ @Test
+ public void afterRegionDestroyIsInvokedInEveryMember() {
+ CacheListener<String, Integer> listener = new RegionDestroyCountingCacheListener();
+ Region<String, Integer> region = createRegion(regionName, listener);
+
+ for (int i = 0; i < getVMCount(); i++) {
+ getVM(i).invoke(() -> {
+ withData(createRegion(regionName, listener));
+ });
+ }
+
+ region.destroyRegion();
+
+ assertThat(sharedCountersRule.getTotal(REGION_DESTROY)).isEqualTo(expectedRegionDestroys());
+ }
+
+ @Test
+ public void afterRegionDestroyIsInvokedOnNodeWithListener() {
+ CacheListener<String, Integer> listener = new RegionDestroyCountingCacheListener();
+ Region<String, Integer> region = createRegion(regionName, listener);
+
+ for (int i = 0; i < getVMCount(); i++) {
+ getVM(i).invoke(() -> {
+ withData(createRegion(regionName, null));
+ });
+ }
+
+ region.destroyRegion();
+
+ assertThat(sharedCountersRule.getTotal(REGION_DESTROY)).isEqualTo(1);
+ }
+
+ @Test
+ public void afterRegionDestroyIsInvokedOnRemoteNodeWithListener() {
+ CacheListener<String, Integer> listener = new RegionDestroyCountingCacheListener();
+ Region<String, Integer> region = createRegion(regionName, null);
+
+ getVM(0).invoke(() -> {
+ createRegion(regionName, listener);
+ });
+
+ for (int i = 1; i < getVMCount(); i++) {
+ getVM(i).invoke(() -> {
+ withData(createRegion(regionName, null));
+ });
+ }
+
+ region.destroyRegion();
+
+ assertThat(sharedCountersRule.getTotal(REGION_DESTROY)).isEqualTo(1);
+ }
+
+ @Test
+ public void afterRegionDestroyIsInvokedOnAccessorAndDataMembers() {
+ CacheListener<String, Integer> listener = new RegionDestroyCountingCacheListener();
+ Region<String, Integer> region = createAccessorRegion(regionName, listener);
+ for (int i = 0; i < getVMCount(); i++) {
+ getVM(i).invoke(() -> {
+ withData(createRegion(regionName, listener));
+ });
+ }
+
+ region.destroyRegion();
+
+ assertThat(sharedCountersRule.getTotal(REGION_DESTROY)).isEqualTo(expectedRegionDestroys());
+ }
+
+ @Test
+ public void afterRegionDestroyIsInvokedOnAccessor() {
+ CacheListener<String, Integer> listener = new RegionDestroyCountingCacheListener();
+ Region<String, Integer> region = createAccessorRegion(regionName, listener);
+
+ for (int i = 0; i < getVMCount(); i++) {
+ getVM(i).invoke(() -> {
+ withData(createRegion(regionName, null));
+ });
+ }
+
+ region.destroyRegion();
+
+ assertThat(sharedCountersRule.getTotal(REGION_DESTROY)).isEqualTo(1);
+ }
+
+ @Test
+ public void afterRegionDestroyIsInvokedNonOnNonAccessor() {
Review comment:
Good catch. Will be addressed in the next checkin.
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org