Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[ISSUE-553] Avoid removing buffer multiple times when clearing resources #534

Merged
merged 2 commits into from
Feb 2, 2023
Merged

[ISSUE-553] Avoid removing buffer multiple times when clearing resources #534

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e75bce9
Avoid remove buffer multiple times when clear resource for expired ap…
xianjingfeng Feb 1, 2023
67d1559
Add ut
xianjingfeng Feb 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions server/src/main/java/org/apache/uniffle/server/buffer/ShuffleBufferManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -546,7 +546,7 @@ public void removeBufferByShuffleId(String appId, Integer... shuffleIds) {
for (int shuffleId : shuffleIds) {
long size = 0;

RangeMap<Integer, ShuffleBuffer> bufferRangeMap = shuffleIdToBuffers.get(shuffleId);
RangeMap<Integer, ShuffleBuffer> bufferRangeMap = shuffleIdToBuffers.remove(shuffleId);
if (bufferRangeMap == null) {
continue;
}
Expand All @@ -561,7 +561,6 @@ public void removeBufferByShuffleId(String appId, Integer... shuffleIds) {
if (shuffleIdToSizeMap != null) {
shuffleIdToSizeMap.remove(shuffleId);
}
shuffleIdToBuffers.remove(shuffleId);
}
}

Expand Down
50 changes: 50 additions & 0 deletions server/src/test/java/org/apache/uniffle/server/ShuffleTaskManagerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -622,6 +622,56 @@ public void clearMultiTimesTest() throws Exception {
assertTrue(shuffleTaskManager.getCachedBlockIds(appId, shuffleId).isEmpty());
}

@Test
public void removeResourcesByShuffleIdsMultiTimesTest() throws Exception {
ShuffleServerConf conf = new ShuffleServerConf();
String storageBasePath = HDFS_URI + "rss/removeResourcesByShuffleIdsMultiTimesTest";
final int shuffleId = 1;
conf.set(ShuffleServerConf.RPC_SERVER_PORT, 1234);
conf.set(ShuffleServerConf.RSS_COORDINATOR_QUORUM, "localhost:9527");
conf.set(ShuffleServerConf.JETTY_HTTP_PORT, 12345);
conf.set(ShuffleServerConf.JETTY_CORE_POOL_SIZE, 64);
conf.set(ShuffleServerConf.SERVER_BUFFER_CAPACITY, 128L);
conf.set(ShuffleServerConf.SERVER_MEMORY_SHUFFLE_HIGHWATERMARK_PERCENTAGE, 50.0);
conf.set(ShuffleServerConf.SERVER_MEMORY_SHUFFLE_LOWWATERMARK_PERCENTAGE, 0.0);
conf.set(ShuffleServerConf.RSS_STORAGE_BASE_PATH, Arrays.asList(storageBasePath));
conf.set(ShuffleServerConf.RSS_STORAGE_TYPE, StorageType.HDFS.name());
conf.set(ShuffleServerConf.RSS_TEST_MODE_ENABLE, true);
conf.set(ShuffleServerConf.SERVER_COMMIT_TIMEOUT, 10000L);
conf.set(ShuffleServerConf.SERVER_APP_EXPIRED_WITHOUT_HEARTBEAT, 2000L);
conf.set(ShuffleServerConf.HEALTH_CHECK_ENABLE, false);

ShuffleServer shuffleServer = new ShuffleServer(conf);
ShuffleTaskManager shuffleTaskManager = shuffleServer.getShuffleTaskManager();
String appId = "removeResourcesByShuffleIdsMultiTimesTest";
shuffleTaskManager.registerShuffle(
appId,
shuffleId,
Lists.newArrayList(new PartitionRange(0, 1)),
RemoteStorageInfo.EMPTY_REMOTE_STORAGE,
StringUtils.EMPTY
);
shuffleTaskManager.refreshAppId(appId);
assertEquals(1, shuffleTaskManager.getAppIds().size());

shuffleTaskManager.checkResourceStatus();
assertEquals(Sets.newHashSet(appId), shuffleTaskManager.getAppIds());
assertEquals(1, (int) ShuffleServerMetrics.gaugeTotalPartitionNum.get());
CountDownLatch countDownLatch = new CountDownLatch(3);
List<Integer> shuffleIds = Lists.newArrayList(shuffleId);
for (int i = 0; i < 3; i++) {
new Thread(() -> {
try {
shuffleTaskManager.removeResourcesByShuffleIds(appId, shuffleIds);
} finally {
countDownLatch.countDown();
}
}).start();
}
countDownLatch.await();
assertEquals(0, (int) ShuffleServerMetrics.gaugeTotalPartitionNum.get());
}

@Test
public void getBlockIdsByPartitionIdTest() {
ShuffleServerConf conf = new ShuffleServerConf();
Expand Down