You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by ds...@apache.org on 2016/07/05 21:05:50 UTC
incubator-geode git commit: removed some todo comments and unused
statics
Repository: incubator-geode
Updated Branches:
refs/heads/feature/GEODE-1420 bb07a2933 -> 2f99f0be4
removed some todo comments and unused statics
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/2f99f0be
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/2f99f0be
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/2f99f0be
Branch: refs/heads/feature/GEODE-1420
Commit: 2f99f0be451cca767189e04f49aeec2769bd4402
Parents: bb07a29
Author: Darrel Schneider <ds...@pivotal.io>
Authored: Tue Jul 5 14:05:11 2016 -0700
Committer: Darrel Schneider <ds...@pivotal.io>
Committed: Tue Jul 5 14:05:11 2016 -0700
----------------------------------------------------------------------
.../internal/cache/AbstractRegionMap.java | 3 ---
.../gemfire/internal/cache/LocalRegion.java | 20 ++++++++------------
.../gemfire/internal/cache/ProxyRegionMap.java | 7 -------
.../gemfire/internal/cache/RegionMap.java | 5 -----
.../internal/cache/TombstoneService.java | 14 +++++---------
5 files changed, 13 insertions(+), 36 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/2f99f0be/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/AbstractRegionMap.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/AbstractRegionMap.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/AbstractRegionMap.java
index d443edc..f3cb3d6 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/AbstractRegionMap.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/AbstractRegionMap.java
@@ -3623,9 +3623,6 @@ public abstract class AbstractRegionMap implements RegionMap {
}
}
- public final void unscheduleTombstone(RegionEntry re) {
- }
-
/**
* for testing race conditions between threads trying to apply ops to the
* same entry
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/2f99f0be/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/LocalRegion.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/LocalRegion.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/LocalRegion.java
index 80d0489..7da2b45 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/LocalRegion.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/LocalRegion.java
@@ -3285,15 +3285,20 @@ public class LocalRegion extends AbstractRegion
public int getTombstoneCount() {
return this.tombstoneCount.get();
}
-
public void scheduleTombstone(RegionEntry entry, VersionTag destroyedVersion) {
+ scheduleTombstone(entry, destroyedVersion, false);
+ }
+
+ public void scheduleTombstone(RegionEntry entry, VersionTag destroyedVersion, boolean reschedule) {
if (destroyedVersion == null) {
throw new NullPointerException("destroyed version tag cannot be null");
}
// Object sync = TombstoneService.DEBUG_TOMBSTONE_COUNT? TombstoneService.debugSync : new Object();
// lastUnscheduled.set(null);
// synchronized(sync) {
+ if (!reschedule) {
incTombstoneCount(1);
+ }
// if (entry instanceof AbstractRegionEntry) {
// AbstractRegionEntry are = (AbstractRegionEntry)entry;
// if (are.isTombstoneScheduled()) {
@@ -3303,7 +3308,7 @@ public class LocalRegion extends AbstractRegion
// are.setTombstoneScheduled(true);
// }
if (logger.isTraceEnabled(LogMarker.TOMBSTONE_COUNT)) {
- logger.trace(LogMarker.TOMBSTONE_COUNT, "scheduling tombstone for {} version={} count is {} entryMap size is {}",
+ logger.trace(LogMarker.TOMBSTONE_COUNT, "{} tombstone for {} version={} count is {} entryMap size is {}", reschedule ? "rescheduling" : "scheduling",
entry.getKey(), entry.getVersionStamp().asVersionTag(), this.tombstoneCount.get(), this.entries.size()/*, new Exception("stack trace")*/);
// this can be useful for debugging tombstone count problems if there aren't a lot of concurrent threads
// if (TombstoneService.DEBUG_TOMBSTONE_COUNT && this.entries instanceof AbstractRegionMap) {
@@ -3319,12 +3324,7 @@ public class LocalRegion extends AbstractRegion
// ThreadLocal<Exception> lastUnscheduledPlace = new ThreadLocal<Exception>();
public void rescheduleTombstone(RegionEntry entry, VersionTag version) {
- Object sync = TombstoneService.DEBUG_TOMBSTONE_COUNT? TombstoneService.debugSync : new Object();
- synchronized(sync) {
- unscheduleTombstone(entry, false); // count is off by one, so don't allow validation to take place
- scheduleTombstone(entry, version);
- }
-
+ scheduleTombstone(entry, version, true);
}
public void unscheduleTombstone(RegionEntry entry) {
@@ -3337,7 +3337,6 @@ public class LocalRegion extends AbstractRegion
logger.trace(LogMarker.TOMBSTONE, "unscheduling tombstone for {} count is {} entryMap size is {}",
entry.getKey(), this.tombstoneCount.get(), this.entries.size()/*, new Exception("stack trace")*/);
}
- getRegionMap().unscheduleTombstone(entry);
if (logger.isTraceEnabled(LogMarker.TOMBSTONE_COUNT) && validate) {
if (this.entries instanceof AbstractRegionMap) {
((AbstractRegionMap) this.entries).verifyTombstoneCount(this.tombstoneCount);
@@ -11917,9 +11916,7 @@ public class LocalRegion extends AbstractRegion
/** test hook - dump the backing map for this region */
public void dumpBackingMap() {
- Object sync = TombstoneService.DEBUG_TOMBSTONE_COUNT? TombstoneService.debugSync : new Object();
synchronized(this.entries) {
- synchronized(sync) {
if (this.entries instanceof AbstractRegionMap) {
((AbstractRegionMap)(this.entries)).verifyTombstoneCount(this.tombstoneCount);
}
@@ -11927,7 +11924,6 @@ public class LocalRegion extends AbstractRegion
if (this.entries instanceof AbstractRegionMap) {
((AbstractRegionMap)this.entries).dumpMap();
}
- }
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/2f99f0be/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/ProxyRegionMap.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/ProxyRegionMap.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/ProxyRegionMap.java
index 55d11fc..3ad2cc1 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/ProxyRegionMap.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/ProxyRegionMap.java
@@ -718,13 +718,6 @@ final class ProxyRegionMap implements RegionMap {
throw new IllegalStateException("removeTombstone should never be called on a proxy");
}
-
- /* (non-Javadoc)
- * @see com.gemstone.gemfire.internal.cache.RegionMap#unscheduleTombstone(com.gemstone.gemfire.internal.cache.RegionEntry)
- */
- public void unscheduleTombstone(RegionEntry re) {
- }
-
public void setEntryFactory(RegionEntryFactory f) {
throw new IllegalStateException("Should not be called on a ProxyRegionMap");
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/2f99f0be/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RegionMap.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RegionMap.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RegionMap.java
index 57f8853..14a2d2f 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RegionMap.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RegionMap.java
@@ -381,11 +381,6 @@ public interface RegionMap extends LRUMapCallbacks {
*/
public boolean isTombstoneNotNeeded(RegionEntry re, int destroyedVersion);
- /**
- * a tombstone has been unscheduled - update LRU stats if necessary
- */
- public void unscheduleTombstone(RegionEntry re);
-
public void updateEntryVersion(EntryEventImpl event);
/**
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/2f99f0be/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TombstoneService.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TombstoneService.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TombstoneService.java
index 2813864..6ef6a56 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TombstoneService.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TombstoneService.java
@@ -104,10 +104,6 @@ public class TombstoneService {
/** maximum time a sweeper will sleep, in milliseconds. */
public static long MAX_SLEEP_TIME = 10000;
- public final static Object debugSync = new Object();
- public final static boolean DEBUG_TOMBSTONE_COUNT = Boolean
- .getBoolean(DistributionConfig.GEMFIRE_PREFIX + "TombstoneService.DEBUG_TOMBSTONE_COUNT"); // TODO:LOG:replace TombstoneService.DEBUG_TOMBSTONE_COUNT
-
public static boolean IDLE_EXPIRATION = false; // dunit test hook for forced batch expiration
/**
@@ -621,11 +617,11 @@ public class TombstoneService {
}
private boolean isFreeMemoryLow() {
Runtime rt = Runtime.getRuntime();
- long freeMemory = rt.freeMemory();
- long totalMemory = rt.totalMemory();
- long maxMemory = rt.maxMemory();
- freeMemory += (maxMemory-totalMemory); // TODO: I think "max-total" is "free" which we already fetched so why += it?
- return freeMemory / (totalMemory * 1.0) < GC_MEMORY_THRESHOLD; // TODO: why divide by "total" instead of "max"?
+ long unusedMemory = rt.freeMemory(); // "free" is how much space we have allocated that is currently not used
+ long totalMemory = rt.totalMemory(); // "total" is how much space we have allocated
+ long maxMemory = rt.maxMemory(); // "max" is how much space we can allocate
+ unusedMemory += (maxMemory-totalMemory); // "max-total" is how much space we have that has not yet been allocated
+ return unusedMemory / (totalMemory * 1.0) < GC_MEMORY_THRESHOLD;
}
@Override protected boolean hasExpired(long msTillHeadTombstoneExpires) {
if (testHook_forceExpirationCount > 0) {