geode git commit: fix-5
Repository: geode
Updated Branches:
refs/heads/feature/GEM-1483 1e8095dcc -> 524983349
fix-5
Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/52498334
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/52498334
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/52498334
Branch: refs/heads/feature/GEM-1483
Commit: 524983349ccc576623eb69860d5287b8343a6064
Parents: 1e8095d
Author: zhouxh
Authored: Wed Jun 21 18:13:11 2017 -0700
Committer: zhouxh
Committed: Wed Jun 21 18:13:11 2017 -0700
--
.../apache/geode/internal/cache/PartitionedRegionDataStore.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/geode/blob/52498334/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegionDataStore.java
--
diff --git
a/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegionDataStore.java
b/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegionDataStore.java
index 9dc0a18..798436d 100644
---
a/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegionDataStore.java
+++
b/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegionDataStore.java
@@ -1442,7 +1442,8 @@ public class PartitionedRegionDataStore implements
HasCachePerfStats {
logger
.debug(pr + " bucketId=" + bucketId + " has remote primary,
checking its children");
}
- isRemotePrimaryReady = isRemotePrimaryReady &&
pr.getDataStore().isRemotePrimaryReadyForColocatedChildren(bucketId);
+ isRemotePrimaryReady = isRemotePrimaryReady
+ &&
pr.getDataStore().isRemotePrimaryReadyForColocatedChildren(bucketId);
}
}
}
[40/40] geode git commit: fix-5
fix-5
Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/a192c9ff
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/a192c9ff
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/a192c9ff
Branch: refs/heads/feature/GEM-1299
Commit: a192c9ff6f6dec6d2c7880a8f6de0263551978cb
Parents: 26338f7
Author: zhouxh
Authored: Fri Apr 21 10:45:47 2017 -0700
Committer: zhouxh
Committed: Thu Apr 27 11:47:01 2017 -0700
--
.../geode/cache/lucene/internal/LuceneEventListenerJUnitTest.java | 2 ++
1 file changed, 2 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/geode/blob/a192c9ff/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneEventListenerJUnitTest.java
--
diff --git
a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneEventListenerJUnitTest.java
b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneEventListenerJUnitTest.java
index 54fdf04..71d08ea 100644
---
a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneEventListenerJUnitTest.java
+++
b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneEventListenerJUnitTest.java
@@ -117,6 +117,8 @@ public class LuceneEventListenerJUnitTest {
.thenThrow(BucketNotFoundException.class);
LuceneEventListener listener = new LuceneEventListener(manager);
+listener = spy(listener);
+doNothing().when(listener).redistributeEvents(any());
listener.logger = log;
AsyncEvent event = Mockito.mock(AsyncEvent.class);
boolean result = listener.processEvents(Arrays.asList(new AsyncEvent[]
{event}));
geode git commit: fix-5
Repository: geode
Updated Branches:
refs/heads/feature/GEM-1299 be448673d -> d6530908d
fix-5
Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/d6530908
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/d6530908
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/d6530908
Branch: refs/heads/feature/GEM-1299
Commit: d6530908de1f66610dc770af98c097bd400f416c
Parents: be44867
Author: zhouxh
Authored: Fri Apr 21 10:45:47 2017 -0700
Committer: zhouxh
Committed: Fri Apr 21 10:45:47 2017 -0700
--
.../geode/cache/lucene/internal/LuceneEventListenerJUnitTest.java | 2 ++
1 file changed, 2 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/geode/blob/d6530908/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneEventListenerJUnitTest.java
--
diff --git
a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneEventListenerJUnitTest.java
b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneEventListenerJUnitTest.java
index 54fdf04..71d08ea 100644
---
a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneEventListenerJUnitTest.java
+++
b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneEventListenerJUnitTest.java
@@ -117,6 +117,8 @@ public class LuceneEventListenerJUnitTest {
.thenThrow(BucketNotFoundException.class);
LuceneEventListener listener = new LuceneEventListener(manager);
+listener = spy(listener);
+doNothing().when(listener).redistributeEvents(any());
listener.logger = log;
AsyncEvent event = Mockito.mock(AsyncEvent.class);
boolean result = listener.processEvents(Arrays.asList(new AsyncEvent[]
{event}));
geode git commit: fix-5
Repository: geode
Updated Branches:
refs/heads/feature/GEM-1353 45746d6c0 -> 45fa575bd
fix-5
Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/45fa575b
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/45fa575b
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/45fa575b
Branch: refs/heads/feature/GEM-1353
Commit: 45fa575bd786306e9af359028c097b31cd9ffc43
Parents: 45746d6
Author: zhouxh
Authored: Wed Apr 12 13:23:56 2017 -0700
Committer: zhouxh
Committed: Wed Apr 12 13:23:56 2017 -0700
--
.../internal/cache/AbstractUpdateOperation.java | 19 ---
.../cache/DistributedCacheOperation.java | 17 -
.../geode/internal/cache/Bug45934DUnitTest.java | 4 ++--
3 files changed, 18 insertions(+), 22 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/geode/blob/45fa575b/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractUpdateOperation.java
--
diff --git
a/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractUpdateOperation.java
b/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractUpdateOperation.java
index 55df601..26fdde5 100644
---
a/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractUpdateOperation.java
+++
b/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractUpdateOperation.java
@@ -40,8 +40,6 @@ import
org.apache.geode.internal.cache.versions.ConcurrentCacheModificationExcep
import org.apache.geode.internal.cache.versions.VersionTag;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.logging.LogService;
-import org.apache.geode.internal.logging.log4j.LogMarker;
-import org.apache.geode.internal.util.DelayedAction;
/**
* Common code for both UpdateOperation and DistributedPutAllOperation.
@@ -55,7 +53,6 @@ public abstract class AbstractUpdateOperation extends
DistributedCacheOperation
@edu.umd.cs.findbugs.annotations.SuppressWarnings(
value = "UWF_UNWRITTEN_PUBLIC_OR_PROTECTED_FIELD",
justification = "test hook that is unset normally")
- public static volatile DelayedAction test_InvalidVersionAction;
private final long lastModifiedTime;
@@ -65,22 +62,6 @@ public abstract class AbstractUpdateOperation extends
DistributedCacheOperation
}
@Override
- public void distribute() {
-try {
- super.distribute();
-} catch (InvalidVersionException e) {
- if (logger.isDebugEnabled()) {
-logger.trace(LogMarker.DM, "PutAll failed since versions were missing;
retrying again", e);
- }
-
- if (test_InvalidVersionAction != null) {
-test_InvalidVersionAction.run();
- }
- super.distribute();
-}
- }
-
- @Override
protected Set getRecipients() {
CacheDistributionAdvisor advisor =
getRegion().getCacheDistributionAdvisor();
return advisor.adviseUpdate(getEvent());
http://git-wip-us.apache.org/repos/asf/geode/blob/45fa575b/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedCacheOperation.java
--
diff --git
a/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedCacheOperation.java
b/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedCacheOperation.java
index 86063a2..0a9ccd8 100644
---
a/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedCacheOperation.java
+++
b/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedCacheOperation.java
@@ -33,6 +33,7 @@ import org.apache.logging.log4j.Logger;
import org.apache.geode.CancelException;
import org.apache.geode.DataSerializer;
import org.apache.geode.InvalidDeltaException;
+import org.apache.geode.InvalidVersionException;
import org.apache.geode.SystemFailure;
import org.apache.geode.cache.CacheEvent;
import org.apache.geode.cache.CacheFactory;
@@ -78,6 +79,7 @@ import org.apache.geode.internal.offheap.StoredObject;
import org.apache.geode.internal.offheap.annotations.Released;
import org.apache.geode.internal.offheap.annotations.Unretained;
import org.apache.geode.internal.sequencelog.EntryLogger;
+import org.apache.geode.internal.util.DelayedAction;
/**
*
@@ -240,6 +242,8 @@ public abstract class DistributedCacheOperation {
return true;
}
+ public static volatile DelayedAction test_InvalidVersionAction;
+
/**
* region's distribution advisor marked that a distribution is about to
start, then distribute. It
* returns a token, which is view version. Return -1 means the method did
not succeed. This method
@@ -256,7 +260,18 @@ public abstract class DistributedCacheOperation {
logger.trace(LogMarker.STATE_FLUSH_OP, "dispatching operation in
