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/12/16 23:20:07 UTC
[geode] branch feature/GEODE-8278 updated: GEODE-8278: Modified to
cause lruEntryUpdate to be called
This is an automated email from the ASF dual-hosted git repository.
boglesby pushed a commit to branch feature/GEODE-8278
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/feature/GEODE-8278 by this push:
new 0b8df11 GEODE-8278: Modified to cause lruEntryUpdate to be called
0b8df11 is described below
commit 0b8df1158cd916b2217bc800881ae2f49fe74241
Author: Barry Oglesby <bo...@pivotal.io>
AuthorDate: Wed Dec 16 15:18:43 2020 -0800
GEODE-8278: Modified to cause lruEntryUpdate to be called
---
.../geode/internal/cache/AbstractRegionMap.java | 20 +++++++++++---------
.../org/apache/geode/internal/cache/LocalRegion.java | 1 +
2 files changed, 12 insertions(+), 9 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 c29e8c9..87bb8c3 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
@@ -838,11 +838,11 @@ public abstract class AbstractRegionMap extends BaseRegionMap
if (result) {
if (oldIsTombstone) {
owner.unscheduleTombstone(oldRe);
- if (newValue != Token.TOMBSTONE) {
- lruEntryCreate(oldRe);
- } else {
- lruEntryUpdate(oldRe);
- }
+ }
+ if (newValue != Token.TOMBSTONE) {
+ lruEntryCreate(oldRe);
+ } else {
+ lruEntryUpdate(oldRe);
}
if (newValue == Token.TOMBSTONE) {
if (!oldIsDestroyedOrRemoved) {
@@ -943,10 +943,12 @@ public abstract class AbstractRegionMap extends BaseRegionMap
done = false;
cleared = true;
} finally {
- if (done && !deferLRUCallback) {
- lruUpdateCallback();
- } else if (!cleared) {
- resetThreadLocals();
+ if (!deferLRUCallback) {
+ if (done) {
+ lruUpdateCallback();
+ } else if (!cleared) {
+ resetThreadLocals();
+ }
}
}
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/LocalRegion.java b/geode-core/src/main/java/org/apache/geode/internal/cache/LocalRegion.java
index 61328f3..96b2738 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/LocalRegion.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/LocalRegion.java
@@ -10219,6 +10219,7 @@ public class LocalRegion extends AbstractRegion implements LoaderHelperFactory,
long numOverflowBytesOnDisk) {
getDiskRegion().getStats().incNumEntriesInVM(numEntriesInVM);
getDiskRegion().getStats().incNumOverflowOnDisk(numOverflowOnDisk);
+ getDiskRegion().getStats().incNumOverflowBytesOnDisk(numOverflowBytesOnDisk);
}
/**