GEODE-10323: Add small changes after review (apache#7819)

jmelchio · Jul 15, 2022 · e67e38e · e67e38e
1 parent a88c8b5
commit e67e38e
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 12 deletions.
diff --git a/geode-core/src/main/java/org/apache/geode/internal/offheap/MemoryAllocatorImpl.java b/geode-core/src/main/java/org/apache/geode/internal/offheap/MemoryAllocatorImpl.java
@@ -187,7 +187,7 @@ public static MemoryAllocatorImpl createForUnitTest(OutOfOffHeapMemoryListener o
       }
     }
     return create(oooml, stats, slabCount, offHeapMemorySize, maxSlabSize, slabs, null,
-        null, () -> null);
+        null, () -> new DummyNonRealTimeStatsUpdater());
   }
 
   private void reuse(OutOfOffHeapMemoryListener oooml, OffHeapMemoryStats newStats,
@@ -240,9 +240,7 @@ private MemoryAllocatorImpl(final OutOfOffHeapMemoryListener oooml,
   }
 
   void start() {
-    if (nonRealTimeStatsUpdater != null) {
-      nonRealTimeStatsUpdater.start(updateOffHeapStatsFrequencyMs);
-    }
+    nonRealTimeStatsUpdater.start(updateOffHeapStatsFrequencyMs);
   }
 
   public List<OffHeapStoredObject> getLostChunks(InternalCache cache) {
@@ -540,4 +538,16 @@ public synchronized List<MemoryBlock> getOrphans(InternalCache cache) {
   public MemoryInspector getMemoryInspector() {
     return memoryInspector;
   }
+
+  public static class DummyNonRealTimeStatsUpdater extends NonRealTimeStatsUpdater {
+    public DummyNonRealTimeStatsUpdater() {
+      super(null);
+    }
+
+    @Override
+    void start(int frequency) {}
+
+    @Override
+    void stop() {};
+  }
 }
diff --git a/geode-core/src/test/java/org/apache/geode/internal/offheap/MemoryAllocatorJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/offheap/MemoryAllocatorJUnitTest.java
@@ -14,6 +14,7 @@
  */
 package org.apache.geode.internal.offheap;
 
+import static org.apache.geode.internal.offheap.MemoryAllocatorImpl.DummyNonRealTimeStatsUpdater;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
@@ -74,7 +75,7 @@ public void testCreate() {
       try {
         MemoryAllocatorImpl.create(listener, stats, 10, 950, 100, null, size -> {
           throw new OutOfMemoryError("expected");
-        }, null, () -> null);
+        }, null, () -> new DummyNonRealTimeStatsUpdater());
       } catch (OutOfMemoryError expected) {
       }
       assertTrue(listener.isClosed());
@@ -99,7 +100,7 @@ public Slab create(int size) {
           }
         };
         MemoryAllocatorImpl.create(listener, stats, 10, 950, MAX_SLAB_SIZE, null, factory, null,
-            () -> null);
+            () -> new MemoryAllocatorImpl.DummyNonRealTimeStatsUpdater());
       } catch (OutOfMemoryError expected) {
       }
       assertTrue(listener.isClosed());
@@ -111,7 +112,7 @@ public Slab create(int size) {
       SlabFactory factory = SlabImpl::new;
       MemoryAllocator ma =
           MemoryAllocatorImpl.create(listener, stats, 10, 950, 100, null, factory, null,
-              () -> null);
+              () -> new DummyNonRealTimeStatsUpdater());
       try {
         assertFalse(listener.isClosed());
         assertFalse(stats.isClosed());
@@ -138,7 +139,7 @@ public Slab create(int size) {
         stats2 = new NullOffHeapMemoryStats();
         MemoryAllocator ma2 =
             MemoryAllocatorImpl.create(listener, stats2, 10, 950, 100, null, factory, null,
-                () -> null);
+                () -> new DummyNonRealTimeStatsUpdater());
         assertSame(ma, ma2);
         assertTrue(stats.isClosed());
         assertFalse(listener.isClosed());

diff --git a/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapHelperJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapHelperJUnitTest.java
@@ -14,6 +14,7 @@
  */
 package org.apache.geode.internal.offheap;
 
+import static org.apache.geode.internal.offheap.MemoryAllocatorImpl.DummyNonRealTimeStatsUpdater;
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.not;
@@ -46,7 +47,7 @@ public void setUp() {
     OffHeapMemoryStats stats = mock(OffHeapMemoryStats.class);
 
     ma = MemoryAllocatorImpl.create(ooohml, stats, 3, OffHeapStorage.MIN_SLAB_SIZE * 3,
-        OffHeapStorage.MIN_SLAB_SIZE, null, () -> null);
+        OffHeapStorage.MIN_SLAB_SIZE, null, () -> new DummyNonRealTimeStatsUpdater());
   }
 
   /**

diff --git a/...src/test/java/org/apache/geode/internal/offheap/OffHeapRegionEntryHelperInstanceTest.java b/...src/test/java/org/apache/geode/internal/offheap/OffHeapRegionEntryHelperInstanceTest.java
@@ -55,6 +55,7 @@
 import org.apache.geode.internal.cache.entries.DiskEntry;
 import org.apache.geode.internal.cache.entries.OffHeapRegionEntry;
 import org.apache.geode.internal.cache.entries.VersionedStatsDiskRegionEntryOffHeap;
+import org.apache.geode.internal.offheap.MemoryAllocatorImpl.DummyNonRealTimeStatsUpdater;
 import org.apache.geode.internal.serialization.DSCODE;
 
 public class OffHeapRegionEntryHelperInstanceTest {
@@ -81,7 +82,7 @@ public void setUp() {
 
     memoryAllocator =
         MemoryAllocatorImpl.create(listener, stats, 1, OffHeapStorage.MIN_SLAB_SIZE,
-            OffHeapStorage.MIN_SLAB_SIZE, null, () -> null);
+            OffHeapStorage.MIN_SLAB_SIZE, null, () -> new DummyNonRealTimeStatsUpdater());
 
     offHeapRegionEntryHelperInstance =
         spy(new OffHeapRegionEntryHelperInstance(ohAddress -> offHeapStoredObject,

diff --git a/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapStorageJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapStorageJUnitTest.java
@@ -30,6 +30,7 @@
 import org.apache.geode.distributed.internal.DistributionStats;
 import org.apache.geode.distributed.internal.InternalDistributedSystem;
 import org.apache.geode.distributed.internal.InternalLocator;
+import org.apache.geode.internal.offheap.MemoryAllocatorImpl.DummyNonRealTimeStatsUpdater;
 import org.apache.geode.internal.statistics.LocalStatisticsFactory;
 import org.apache.geode.util.internal.GeodeGlossary;
 
@@ -168,7 +169,7 @@ public void testCreateOffHeapStorage() {
     OutOfOffHeapMemoryListener ooohml = mock(OutOfOffHeapMemoryListener.class);
     MemoryAllocator ma =
         OffHeapStorage.basicCreateOffHeapStorage(localStatsFactory, 1024 * 1024, ooohml, null,
-            () -> null);
+            () -> new DummyNonRealTimeStatsUpdater());
     try {
       OffHeapMemoryStats stats = ma.getStats();
       assertNotNull(stats.getStats());

diff --git a/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapStoredObjectJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapStoredObjectJUnitTest.java
@@ -42,6 +42,7 @@
 import org.apache.geode.internal.cache.CachePerfStats;
 import org.apache.geode.internal.cache.EntryEventImpl;
 import org.apache.geode.internal.cache.RegionEntryContext;
+import org.apache.geode.internal.offheap.MemoryAllocatorImpl.DummyNonRealTimeStatsUpdater;
 import org.apache.geode.internal.offheap.MemoryBlock.State;
 import org.apache.geode.internal.serialization.DSCODE;
 import org.apache.geode.internal.serialization.KnownVersion;
@@ -74,7 +75,7 @@ public void setUp() {
     OffHeapMemoryStats stats = mock(OffHeapMemoryStats.class);
 
     ma = MemoryAllocatorImpl.create(ooohml, stats, 3, OffHeapStorage.MIN_SLAB_SIZE * 3,
-        OffHeapStorage.MIN_SLAB_SIZE, null, () -> null);
+        OffHeapStorage.MIN_SLAB_SIZE, null, () -> new DummyNonRealTimeStatsUpdater());
   }
 
   @After