HDDS-10487. Intermittent crash in TestSnapshotDiffManager (apache#6346)

ceekay47 · Mar 7, 2024 · 9dab4d2 · 9dab4d2
1 parent 7c8160f
commit 9dab4d2
Showing 1 changed file with 1 addition and 3 deletions.
diff --git a/...ne-manager/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestSnapshotDiffManager.java b/...ne-manager/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestSnapshotDiffManager.java
@@ -390,14 +390,14 @@ public OmSnapshot load(@Nonnull UUID key) {
 
   @AfterEach
   public void tearDown() {
+    IOUtils.closeQuietly(snapshotDiffManager);
     if (columnFamilyHandles != null) {
       columnFamilyHandles.forEach(IOUtils::closeQuietly);
     }
 
     IOUtils.closeQuietly(db);
     IOUtils.closeQuietly(dbOptions);
     IOUtils.closeQuietly(columnFamilyOptions);
-    IOUtils.closeQuietly(snapshotDiffManager);
   }
 
   private OmSnapshot getMockedOmSnapshot(UUID snapshotId) {
@@ -674,8 +674,6 @@ public void testObjectIdMapWithTombstoneEntries(boolean nativeLibraryLoaded,
       Table<String, ? extends WithParentObjectId> fromSnapshotTable =
           getMockedTable(fromSnapshotTableMap, snapshotTableName);
 
-      snapshotDiffManager = new SnapshotDiffManager(db, differ, ozoneManager,
-          snapDiffJobTable, snapDiffReportTable, columnFamilyOptions, codecRegistry);
       SnapshotDiffManager spy = spy(snapshotDiffManager);
 
       doAnswer(invocation -> {