You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by zh...@apache.org on 2018/04/13 01:30:25 UTC
[geode] branch feature/GEODE-5056 updated (2f2b075 -> 2b31ba8)
This is an automated email from the ASF dual-hosted git repository.
zhouxj pushed a change to branch feature/GEODE-5056
in repository https://gitbox.apache.org/repos/asf/geode.git.
omit 2f2b075 GEODE-5056: when found the dropped events at primary sender, send QueueRemovalMessage for it
new 2b31ba8 GEODE-5056: when found the dropped events at primary sender, send QueueRemovalMessage for it
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (2f2b075)
\
N -- N -- N refs/heads/feature/GEODE-5056 (2b31ba8)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../cache/wan/parallel/ParallelGatewaySenderOperationsDUnitTest.java | 2 --
1 file changed, 2 deletions(-)
--
To stop receiving notification emails like this one, please contact
zhouxj@apache.org.
[geode] 01/01: GEODE-5056: when found the dropped events at primary
sender, send QueueRemovalMessage for it
Posted by zh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
zhouxj pushed a commit to branch feature/GEODE-5056
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 2b31ba8e3c1fe08d33e7fa2361dbe6ce2fedd687
Author: zhouxh <gz...@pivotal.io>
AuthorDate: Thu Apr 12 17:44:16 2018 -0700
GEODE-5056: when found the dropped events at primary sender, send
QueueRemovalMessage for it
---
.../cache/wan/AbstractGatewaySenderEventProcessor.java | 2 +-
.../cache/wan/parallel/ParallelGatewaySenderQueue.java | 17 ++++++++++++++++-
.../ParallelGatewaySenderOperationsDUnitTest.java | 2 --
3 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/AbstractGatewaySenderEventProcessor.java b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/AbstractGatewaySenderEventProcessor.java
index eea7480..34d511c 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/AbstractGatewaySenderEventProcessor.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/AbstractGatewaySenderEventProcessor.java
@@ -304,7 +304,7 @@ public abstract class AbstractGatewaySenderEventProcessor extends Thread {
(ParallelGatewaySenderQueue) cpgsq.getQueueByBucket(bucketId);
boolean isPrimary = prQ.getRegionAdvisor().getBucketAdvisor(bucketId).isPrimary();
if (isPrimary) {
- pgsq.addRemovedEvent(prQ, bucketId, shadowKey);
+ pgsq.sendQueueRemovalMesssageForDroppedEvent(prQ, bucketId, shadowKey);
this.sender.getStatistics().incEventsNotQueuedAtYetRunningPrimarySender();
if (logger.isDebugEnabled()) {
logger.debug("register dropped event for primary queue. BucketId is " + bucketId
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderQueue.java b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderQueue.java
index 89880fc..cdb33ab 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderQueue.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderQueue.java
@@ -1112,7 +1112,7 @@ public class ParallelGatewaySenderQueue implements RegionQueue {
// This method may need synchronization in case it is used by
// ConcurrentParallelGatewaySender
- public void addRemovedEvent(PartitionedRegion prQ, int bucketId, Object key) {
+ protected void addRemovedEvent(PartitionedRegion prQ, int bucketId, Object key) {
StoppableReentrantLock lock = buckToDispatchLock;
if (lock != null) {
lock.lock();
@@ -1133,6 +1133,21 @@ public class ParallelGatewaySenderQueue implements RegionQueue {
}
}
+ public void sendQueueRemovalMesssageForDroppedEvent(PartitionedRegion prQ, int bucketId,
+ Object key) {
+ final HashMap<String, Map<Integer, List>> temp = new HashMap<String, Map<Integer, List>>();
+ Map bucketIdToDispatchedKeys = new ConcurrentHashMap();
+ temp.put(prQ.getFullPath(), bucketIdToDispatchedKeys);
+ addRemovedEventToMap(bucketIdToDispatchedKeys, bucketId, key);
+ Set<InternalDistributedMember> recipients =
+ removalThread.getAllRecipients(sender.getCache(), temp);
+ if (!recipients.isEmpty()) {
+ ParallelQueueRemovalMessage pqrm = new ParallelQueueRemovalMessage(temp);
+ pqrm.setRecipients(recipients);
+ sender.getCache().getInternalDistributedSystem().getDistributionManager().putOutgoing(pqrm);
+ }
+ }
+
private void addRemovedEventToMap(Map bucketIdToDispatchedKeys, int bucketId, Object key) {
List dispatchedKeys = (List) bucketIdToDispatchedKeys.get(bucketId);
if (dispatchedKeys == null) {
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderOperationsDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderOperationsDUnitTest.java
index a1808f5..f5b98b7 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderOperationsDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderOperationsDUnitTest.java
@@ -37,7 +37,6 @@ import org.apache.geode.test.dunit.AsyncInvocation;
import org.apache.geode.test.dunit.RMIException;
import org.apache.geode.test.dunit.rules.DistributedRestoreSystemProperties;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.geode.test.junit.categories.FlakyTest;
import org.apache.geode.test.junit.categories.WanTest;
/**
@@ -377,7 +376,6 @@ public class ParallelGatewaySenderOperationsDUnitTest extends WANTestBase {
* case in the way that when the sender is starting from stopped state, puts are simultaneously
* happening on the region by another thread.
*/
- @Category({FlakyTest.class, WanTest.class}) // GEODE-5056
@Test
public void testParallelPropagationSenderStartAfterStop_Scenario2() throws Exception {
addIgnoredException("Broken pipe");
--
To stop receiving notification emails like this one, please contact
zhouxj@apache.org.