You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by bo...@apache.org on 2020/06/30 21:46:55 UTC
[geode] branch feature/GEODE-8324 created (now 514b17a)
This is an automated email from the ASF dual-hosted git repository.
boglesby pushed a change to branch feature/GEODE-8324
in repository https://gitbox.apache.org/repos/asf/geode.git.
at 514b17a GEODE-8324: Don't add a remote ds id to recipients unless it is running
This branch includes the following new commits:
new 514b17a GEODE-8324: Don't add a remote ds id to recipients unless it is running
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.
[geode] 01/01: GEODE-8324: Don't add a remote ds id to recipients
unless it is running
Posted by bo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
boglesby pushed a commit to branch feature/GEODE-8324
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 514b17a5a43093c2301c5305ea356bc48924fe90
Author: Barry Oglesby <bo...@pivotal.io>
AuthorDate: Tue Jun 30 14:44:36 2020 -0700
GEODE-8324: Don't add a remote ds id to recipients unless it is running
---
.../org/apache/geode/internal/cache/AbstractRegion.java | 16 +++++++++-------
.../geode/internal/cache/wan/AbstractGatewaySender.java | 2 +-
2 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegion.java b/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegion.java
index 0364e17..e8c73e5 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegion.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegion.java
@@ -738,15 +738,17 @@ public abstract class AbstractRegion implements InternalRegion, AttributesMutato
if ((sz > 0 || isPdxTypesRegion) && !allGatewaySenders.isEmpty()) {
List<Integer> allRemoteDSIds = new ArrayList<>(sz);
for (GatewaySender sender : allGatewaySenders) {
- // This is for all regions except pdx Region
- if (!isPdxTypesRegion) {
- // Make sure we are distributing to only those senders whose id
- // is available on this region
- if (allGatewaySenderIds.contains(sender.getId())) {
+ if (sender.isRunning()) {
+ // This is for all regions except pdx Region
+ if (!isPdxTypesRegion) {
+ // Make sure we are distributing to only those senders whose id
+ // is available on this region
+ if (allGatewaySenderIds.contains(sender.getId())) {
+ allRemoteDSIds.add(sender.getRemoteDSId());
+ }
+ } else { // this else is for PDX region
allRemoteDSIds.add(sender.getRemoteDSId());
}
- } else { // this else is for PDX region
- allRemoteDSIds.add(sender.getRemoteDSId());
}
}
return allRemoteDSIds;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/AbstractGatewaySender.java b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/AbstractGatewaySender.java
index 396edca..6e4a4f3 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/AbstractGatewaySender.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/AbstractGatewaySender.java
@@ -1036,7 +1036,7 @@ public abstract class AbstractGatewaySender implements InternalGatewaySender, Di
if (this.isPrimary()) {
tmpDroppedEvents.add(clonedEvent);
if (isDebugEnabled) {
- logger.debug("add to tmpDroppedEvents for evnet {}", clonedEvent);
+ logger.debug("add to tmpDroppedEvents for event {}", clonedEvent);
}
}
if (isDebugEnabled) {