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 0ef3579 GEODE-3967: isConcurrencyConflict is set for 3
notifyTimestampsToGateways
0ef3579 is described below
commit 0ef35790a07b937d76f19acd2fd907ec98686b0e
Author: zhouxh <[email protected]>
AuthorDate: Thu Nov 16 22:38:52 2017 -0800
GEODE-3967: isConcurrencyConflict is set for 3 notifyTimestampsToGateways
---
.../java/org/apache/geode/internal/cache/AbstractRegionMap.java | 3 +++
.../java/org/apache/geode/internal/cache/LocalRegionDataView.java | 4 ++++
.../internal/cache/wan/AbstractGatewaySenderEventProcessor.java | 7 ++-----
3 files changed, 9 insertions(+), 5 deletions(-)
diff --git
a/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegionMap.java
b/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegionMap.java
index da0cf59..ee0a4aa 100644
---
a/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegionMap.java
+++
b/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegionMap.java
@@ -1188,6 +1188,7 @@ public abstract class AbstractRegionMap implements
RegionMap {
true/* conflict with clear */, duringRI, true);
doPart3 = true;
} catch (ConcurrentCacheModificationException ccme) {
+ event.isConcurrencyConflict(true);
VersionTag tag = event.getVersionTag();
if (tag != null && tag.isTimeStampUpdated()) {
// Notify gateways of new time-stamp.
@@ -2097,6 +2098,7 @@ public abstract class AbstractRegionMap implements
RegionMap {
}
} // !opCompleted
} catch (ConcurrentCacheModificationException ccme) {
+ event.isConcurrencyConflict(true);
VersionTag tag = event.getVersionTag();
if (tag != null && tag.isTimeStampUpdated()) {
// Notify gateways of new time-stamp.
@@ -2854,6 +2856,7 @@ public abstract class AbstractRegionMap implements
RegionMap {
clearOccured = true;
owner.recordEvent(event);
} catch (ConcurrentCacheModificationException ccme) {
+ event.isConcurrencyConflict(true);
VersionTag tag = event.getVersionTag();
if (tag != null && tag.isTimeStampUpdated()) {
// Notify gateways of new time-stamp.
diff --git
a/geode-core/src/main/java/org/apache/geode/internal/cache/LocalRegionDataView.java
b/geode-core/src/main/java/org/apache/geode/internal/cache/LocalRegionDataView.java
index 123734a..c591c27 100644
---
a/geode-core/src/main/java/org/apache/geode/internal/cache/LocalRegionDataView.java
+++
b/geode-core/src/main/java/org/apache/geode/internal/cache/LocalRegionDataView.java
@@ -85,6 +85,10 @@ public class LocalRegionDataView implements InternalDataView
{
} catch (ConcurrentCacheModificationException e) {
// a later in time event has already been applied to the cache. this can
happen
// in a cache if another thread is operating on the same key
+ event.isConcurrencyConflict(true);
+ LocalRegion lr = event.getLocalRegion();
+ new Exception("GGG:updateEntryVersion:" +
event).printStackTrace(System.out);
+ // lr.notifyGatewaySender(EnumListenerEvent.TIMESTAMP_UPDATE, event);
}
}
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 f94c21d..a557875 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
@@ -518,11 +518,8 @@ public abstract class AbstractGatewaySenderEventProcessor
extends Thread {
// version is < 7.0.1, especially to prevent another loop over
events.
if (!sendUpdateVersionEvents
&& event.getOperation() == Operation.UPDATE_VERSION_STAMP) {
- if (isTraceEnabled) {
- logger.trace(
- "Update Event Version event: {} removed from Gateway
Sender queue: {}", event,
- sender);
- }
+ logger.debug("Update Event Version event: {} removed from
Gateway Sender queue: {}",
+ event, sender);
itr.remove();
statistics.incEventsNotQueued();
--
To stop receiving notification emails like this one, please contact
['"[email protected]" <[email protected]>'].
