follow by rickyma

apache · Apr 11, 2024 · 42766c8 · 42766c8
1 parent f6c7b12
commit 42766c8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/server/src/main/java/org/apache/uniffle/server/ShuffleTaskManager.java b/server/src/main/java/org/apache/uniffle/server/ShuffleTaskManager.java
@@ -771,9 +771,7 @@ public void removeResources(String appId, boolean checkAppExpired) {
       partitionsToBlockIds.remove(appId);
       shuffleBufferManager.removeBuffer(appId);
       shuffleFlushManager.removeResources(appId);
-
       storageManager.removeResources(new AppPurgeEvent(appId, shuffleTaskInfo.getUser()));
-
       if (shuffleTaskInfo.hasHugePartition()) {
         ShuffleServerMetrics.gaugeAppWithHugePartitionNum.dec();
         ShuffleServerMetrics.gaugeHugePartitionNum.dec(shuffleTaskInfo.getHugePartitionSize());

diff --git a/server/src/test/java/org/apache/uniffle/server/ShuffleTaskManagerTest.java b/server/src/test/java/org/apache/uniffle/server/ShuffleTaskManagerTest.java
@@ -472,7 +472,7 @@ public void removeShuffleDataWithHdfsTest() throws Exception {
     assertNotNull(shuffleBufferManager.getBufferPool().get(appId).get(1));
 
     // the shufflePurgeEvent only will delete the children folders
-    // Once the app is expired, all the app folder should be deleted.
+    // Once the app is expired, all the app folders should be deleted.
     shuffleTaskManager.removeResources(appId, false);
     assertFalse(fs.exists(new Path(appBasePath)));
   }
@@ -534,7 +534,7 @@ public void removeShuffleDataWithLocalfileTest() throws Exception {
     }
 
     // the shufflePurgeEvent only will delete the children folders
-    // Once the app is expired, all the app folder should be deleted.
+    // Once the app is expired, all the app folders should be deleted.
     shuffleTaskManager.removeResources(appId, false);
     for (String path : conf.get(ShuffleServerConf.RSS_STORAGE_BASE_PATH)) {
       String appPath = path + "/" + appId;