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/03/20 06:17:16 UTC
[geode] branch feature/GEODE-4647 updated: GEODE-4647: recovery
will increase secondary queue stats
This is an automated email from the ASF dual-hosted git repository.
zhouxj pushed a commit to branch feature/GEODE-4647
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/feature/GEODE-4647 by this push:
new d09492c GEODE-4647: recovery will increase secondary queue stats
d09492c is described below
commit d09492c90336ffa19e2828e74dd337272a94c5de
Author: zhouxh <gz...@pivotal.io>
AuthorDate: Mon Mar 19 23:16:31 2018 -0700
GEODE-4647: recovery will increase secondary queue stats
---
.../org/apache/geode/internal/cache/AbstractRegionMap.java | 11 +++++++++++
.../geode/internal/cache/wan/AsyncEventQueueTestBase.java | 2 +-
.../java/org/apache/geode/internal/cache/wan/WANTestBase.java | 2 +-
3 files changed, 13 insertions(+), 2 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 71294b0..8db60d9 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
@@ -636,6 +636,11 @@ public abstract class AbstractRegionMap
tombstones.put(tag, newRe);
} else {
_getOwner().updateSizeOnCreate(key, _getOwner().calculateRegionEntryValueSize(newRe));
+ if (_getOwner() instanceof BucketRegionQueue) {
+ BucketRegionQueue brq = (BucketRegionQueue) _getOwner();
+ brq.incSecondaryQueueSize(1);
+// logger.info("GGG:recovery:"+key);
+ }
}
incEntryCount(1);
lruEntryUpdate(newRe);
@@ -661,6 +666,11 @@ public abstract class AbstractRegionMap
} else {
_getOwner().updateSizeOnCreate(re.getKey(),
_getOwner().calculateRegionEntryValueSize(re));
+ if (_getOwner() instanceof BucketRegionQueue) {
+ BucketRegionQueue brq = (BucketRegionQueue) _getOwner();
+ brq.incSecondaryQueueSize(1);
+// logger.info("GGG:recovery null:"+re.getKey());
+ }
}
}
incEntryCount(size());
@@ -1047,6 +1057,7 @@ public abstract class AbstractRegionMap
if (owner instanceof BucketRegionQueue) {
BucketRegionQueue brq = (BucketRegionQueue) owner;
brq.addToEventQueue(key, done, event);
+// logger.info("GGG:ARM:"+key);
}
}
if (!done) {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/wan/AsyncEventQueueTestBase.java b/geode-core/src/test/java/org/apache/geode/internal/cache/wan/AsyncEventQueueTestBase.java
index 5ea5914..d8bb52f 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/wan/AsyncEventQueueTestBase.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/wan/AsyncEventQueueTestBase.java
@@ -720,7 +720,7 @@ public class AsyncEventQueueTestBase extends JUnit4DistributedTestCase {
}
}
final AsyncEventQueueStats statistics = ((AsyncEventQueueImpl) queue).getStatistics();
- Awaitility.await().atMost(60, TimeUnit.SECONDS)
+ Awaitility.await().atMost(120, TimeUnit.SECONDS)
.until(() -> assertEquals("Expected queue entries: " + queueSize + " but actual entries: "
+ statistics.getEventQueueSize(), queueSize, statistics.getEventQueueSize()));
assertEquals(queueSize, statistics.getEventQueueSize());
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/WANTestBase.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/WANTestBase.java
index 3333584..d6297f0 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/WANTestBase.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/WANTestBase.java
@@ -3267,7 +3267,7 @@ public class WANTestBase extends JUnit4DistributedTestCase {
} // for loop ends
assertEquals("Except events in all primary queues after drain is 0", 0,
abstractSender.getEventQueueSize());
- Awaitility.await().atMost(60, TimeUnit.SECONDS).until(() -> {
+ Awaitility.await().atMost(120, TimeUnit.SECONDS).until(() -> {
assertEquals(
"Expected events in all secondary queues are drained but actual is "
+ abstractSender.getEventSecondaryQueueSize(),
--
To stop receiving notification emails like this one, please contact
zhouxj@apache.org.