Added storage destroy to release HD resources.

To release key+value pairs storage#clear should be called, storage#destroy only releases internal resources of backing data structure
hazelcast · Aug 29, 2018 · 88abbb7 · 88abbb7
1 parent 8550196
commit 88abbb7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/MapServiceContextImpl.java b/hazelcast/src/main/java/com/hazelcast/map/impl/MapServiceContextImpl.java
@@ -316,7 +316,7 @@ public void clearMapsHavingLesserBackupCountThan(int partitionId, int backupCoun
                 RecordStore recordStore = iter.next();
                 final MapContainer mapContainer = recordStore.getMapContainer();
                 if (backupCount > mapContainer.getTotalBackupCount()) {
-                    recordStore.clearPartition(false, false);
+                    recordStore.clearPartition(false, true);
                     iter.remove();
                 }
             }
@@ -328,7 +328,7 @@ public void clearPartitionData(int partitionId) {
         final PartitionContainer container = partitionContainers[partitionId];
         if (container != null) {
             for (RecordStore mapPartition : container.getMaps().values()) {
-                mapPartition.clearPartition(false, false);
+                mapPartition.clearPartition(false, true);
             }
             container.getMaps().clear();
         }

diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/recordstore/DefaultRecordStore.java b/hazelcast/src/main/java/com/hazelcast/map/impl/recordstore/DefaultRecordStore.java
@@ -231,6 +231,10 @@ public void clearPartition(boolean onShutdown, boolean onRecordStoreDestroy) {
         }
         clearMapStore();
         clearStorage(onShutdown);
+
+        if (!onShutdown && onRecordStoreDestroy) {
+            storage.destroy(false);
+        }
     }
 
     protected void clearLockStore() {