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 2017/11/30 20:22:00 UTC
[geode] branch feature/GEM-883 updated: GEODE-3967: fix 2
This is an automated email from the ASF dual-hosted git repository.
zhouxj pushed a commit to branch feature/GEM-883
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/feature/GEM-883 by this push:
new f619e36 GEODE-3967: fix 2
f619e36 is described below
commit f619e36a79e276707a941072b1a47f0aa0ebd76d
Author: zhouxh <gz...@pivotal.io>
AuthorDate: Thu Nov 30 12:21:33 2017 -0800
GEODE-3967: fix 2
---
.../cache/wan/serial/SerialGatewaySenderEventProcessor.java | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderEventProcessor.java b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderEventProcessor.java
index aaa12e9..7a44fce 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderEventProcessor.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderEventProcessor.java
@@ -291,6 +291,10 @@ public class SerialGatewaySenderEventProcessor extends AbstractGatewaySenderEven
if (o != null && o instanceof GatewaySenderEventImpl) {
GatewaySenderEventImpl ge = (GatewaySenderEventImpl) o;
EventWrapper unprocessedEvent = this.unprocessedEvents.remove(ge.getEventId());
+ if (unprocessedEvent != null && ge.isConcurrencyConflict) {
+ logger.info(
+ "GGG:secondary after removed by handleFailover:" + unprocessedEvent + ":" + ge);
+ }
if (unprocessedEvent != null) {
unprocessedEvent.event.release();
if (this.unprocessedEvents.isEmpty()) {
@@ -633,6 +637,10 @@ public class SerialGatewaySenderEventProcessor extends AbstractGatewaySenderEven
return;
// now we can safely use the unprocessedEvents field
EventWrapper ew = this.unprocessedEvents.remove(gatewayEvent.getEventId());
+ if (ew != null && gatewayEvent.isConcurrencyConflict) {
+ logger.info("GGG:secondary after removed by destroy listener:" + ew + ":" + gatewayEvent);
+ }
+
if (ew != null) {
ew.event.release();
statistics.incUnprocessedEventsRemovedByPrimary();
@@ -652,6 +660,9 @@ public class SerialGatewaySenderEventProcessor extends AbstractGatewaySenderEven
return;
// now we can safely use the unprocessedEvents field
EventWrapper ew = this.unprocessedEvents.remove(gatewayEvent.getEventId());
+ if (ew != null && gatewayEvent.isConcurrencyConflict) {
+ logger.info("GGG:secondary after removed by create listener:" + ew + ":" + gatewayEvent);
+ }
if (ew == null) {
// first time for the event
@@ -713,7 +724,7 @@ public class SerialGatewaySenderEventProcessor extends AbstractGatewaySenderEven
// now we can safely use the unprocessedEvents field
Long v = this.unprocessedTokens.remove(gatewayEvent.getEventId());
if (v != null && gatewayEvent.isConcurrencyConflict) {
- logger.info("GGG:secondary after removed:" + v + ":" + gatewayEvent);
+ logger.info("GGG:secondary after removed token:" + v + ":" + gatewayEvent);
}
if (v == null) {
--
To stop receiving notification emails like this one, please contact
['"commits@geode.apache.org" <co...@geode.apache.org>'].