Skip to content

[#1428] fix(server): fallback invalid when local storage can't write #1429

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

Merged
zuston merged 4 commits into from
Jan 17, 2024
Merged

[#1428] fix(server): fallback invalid when local storage can't write #1429

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
84d6812
[#1428] fix(server): allow specifying negative fallback threshold to …
zuston Jan 10, 2024
cefbcd7
fix
zuston Jan 10, 2024
85256c5
fix
zuston Jan 16, 2024
14bfe11
fix
zuston Jan 16, 2024
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
2 changes: 0 additions & 2 deletions server/src/main/java/org/apache/uniffle/server/ShuffleServerConf.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,8 +352,6 @@ public class ShuffleServerConf extends RssBaseConf {
public static final ConfigOption<Long> FALLBACK_MAX_FAIL_TIMES =
ConfigOptions.key("rss.server.hybrid.storage.fallback.max.fail.times")
.longType()
.checkValue(
Copy link
Member Author

@zuston zuston Jan 16, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The negative check is unnecessary

Copy link
Contributor

@roryqi roryqi Jan 16, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why do we remove this check?

Copy link
Member Author

@zuston zuston Jan 16, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if -1，it means we could fallback directly once failed at the first time.

Copy link
Contributor

@roryqi roryqi Jan 16, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What about the behaviour of 0?

Copy link
Member Author

@zuston zuston Jan 17, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For the first time fallback, it will reject for 0

ConfigUtils.NON_NEGATIVE_LONG_VALIDATOR, " fallback times must be non-negative")
.defaultValue(0L)
.withDescription("For hybrid storage, fail times exceed the number, will switch storage")
.withDeprecatedKeys("rss.server.multistorage.fallback.max.fail.times");
Expand Down
2 changes: 1 addition & 1 deletion ...src/main/java/org/apache/uniffle/server/storage/HadoopStorageManagerFallbackStrategy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ public HadoopStorageManagerFallbackStrategy(ShuffleServerConf conf) {
@Override
public StorageManager tryFallback(
StorageManager current, ShuffleDataFlushEvent event, StorageManager... candidates) {
if (event.getRetryTimes() > fallBackTimes) {
if (event.getRetryTimes() > fallBackTimes || !current.canWrite(event)) {
return findNextStorageManager(current, excludeTypes, event, candidates);
}
return current;
Expand Down
2 changes: 1 addition & 1 deletion .../src/main/java/org/apache/uniffle/server/storage/LocalStorageManagerFallbackStrategy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ public LocalStorageManagerFallbackStrategy(ShuffleServerConf conf) {
@Override
public StorageManager tryFallback(
StorageManager current, ShuffleDataFlushEvent event, StorageManager... candidates) {
if (event.getRetryTimes() > fallBackTimes) {
if (event.getRetryTimes() > fallBackTimes || !current.canWrite(event)) {
return findNextStorageManager(current, excludeTypes, event, candidates);
}
return current;
Expand Down
3 changes: 2 additions & 1 deletion ...src/main/java/org/apache/uniffle/server/storage/RotateStorageManagerFallbackStrategy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@ public RotateStorageManagerFallbackStrategy(ShuffleServerConf conf) {
public StorageManager tryFallback(
StorageManager current, ShuffleDataFlushEvent event, StorageManager... candidates) {
if (fallBackTimes > 0
&& (event.getRetryTimes() < fallBackTimes || event.getRetryTimes() % fallBackTimes > 0)) {
&& (event.getRetryTimes() < fallBackTimes || event.getRetryTimes() % fallBackTimes > 0)
&& current.canWrite(event)) {
return current;
}
return findNextStorageManager(current, null, event, candidates);
Expand Down
13 changes: 6 additions & 7 deletions server/src/test/java/org/apache/uniffle/server/ShuffleFlushManagerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -697,16 +697,15 @@ public void fallbackWrittenWhenHybridStorageManagerEnableTest(@TempDir File temp
List<ShufflePartitionedBlock> blocks =
Lists.newArrayList(new ShufflePartitionedBlock(100000, 1000, 1, 1, 1L, (byte[]) null));
ShuffleDataFlushEvent bigEvent =
new ShuffleDataFlushEvent(1, "1", 1, 1, 1, 100, blocks, null, null);
new ShuffleDataFlushEvent(1, "1", 2, 1, 1, 100, blocks, null, null);
bigEvent.setUnderStorage(
((HybridStorageManager) storageManager).getWarmStorageManager().selectStorage(event));
((HybridStorageManager) storageManager).getWarmStorageManager().updateWriteMetrics(bigEvent, 0);

event = createShuffleDataFlushEvent(appId, 1, 1, 1, null, 100);
event = createShuffleDataFlushEvent(appId, 3, 1, 1, null, 100);
flushManager.addToFlushQueue(event);
Thread.sleep(1000);
assertTrue(event.getUnderStorage() instanceof HadoopStorage);
assertEquals(1, event.getRetryTimes());
}

@Test
Expand Down Expand Up @@ -756,11 +755,11 @@ public void defaultFlushEventHandlerTest(@TempDir File tempDir) throws Exception
((HybridStorageManager) storageManager).getWarmStorageManager().selectStorage(event));
((HybridStorageManager) storageManager).getWarmStorageManager().updateWriteMetrics(bigEvent, 0);

event = createShuffleDataFlushEvent(appId, 1, 1, 1, null, 100);
event = createShuffleDataFlushEvent(appId, 2, 1, 1, null, 100);
flushManager.addToFlushQueue(event);
waitForFlush(flushManager, appId, 1, 15);
assertEquals(1, event.getRetryTimes());
assertEquals(2, ShuffleServerMetrics.counterLocalFileEventFlush.get());
waitForFlush(flushManager, appId, 2, 5);
assertEquals(0, event.getRetryTimes());
assertEquals(1, ShuffleServerMetrics.counterLocalFileEventFlush.get());
assertEquals(2, ShuffleServerMetrics.counterHadoopEventFlush.get());
}

Expand Down
48 changes: 48 additions & 0 deletions server/src/test/java/org/apache/uniffle/server/storage/HybridStorageManagerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,54 @@

public class HybridStorageManagerTest {

/**
* this tests the fallback strategy when encountering the local storage is invalid. 1. When
* specifying the fallback max fail time = 0, the event will be discarded 2. When specifying the
* fallback max fail time < 0, the event will be taken by Hadoop Storage.
*/
@Test
public void fallbackTestWhenLocalStorageCorrupted() {
ShuffleServerConf conf = new ShuffleServerConf();
conf.setLong(ShuffleServerConf.FLUSH_COLD_STORAGE_THRESHOLD_SIZE, 2000L);
conf.set(ShuffleServerConf.RSS_STORAGE_BASE_PATH, Arrays.asList("test"));
conf.setLong(ShuffleServerConf.DISK_CAPACITY, 1024L * 1024L * 1024L);
conf.setString(
ShuffleServerConf.RSS_STORAGE_TYPE.key(), StorageType.MEMORY_LOCALFILE_HDFS.name());
conf.setString(
ShuffleServerConf.HYBRID_STORAGE_MANAGER_SELECTOR_CLASS,
"org.apache.uniffle.server.storage.hybrid.HugePartitionSensitiveStorageManagerSelector");
conf.setString(
ShuffleServerConf.HYBRID_STORAGE_FALLBACK_STRATEGY_CLASS,
"org.apache.uniffle.server.storage.LocalStorageManagerFallbackStrategy");

// case1: fallback to hadoop storage when fallback_max_fail_time = -1
conf.setLong(ShuffleServerConf.FALLBACK_MAX_FAIL_TIMES, -1);
HybridStorageManager manager = new HybridStorageManager(conf);

LocalStorageManager localStorageManager = (LocalStorageManager) manager.getWarmStorageManager();
localStorageManager.getStorages().get(0).markCorrupted();

String remoteStorage = "test";
String appId = "selectStorageManagerWithSelectorAndFallbackStrategy_appId";
manager.registerRemoteStorage(appId, new RemoteStorageInfo(remoteStorage));
List<ShufflePartitionedBlock> blocks =
Lists.newArrayList(new ShufflePartitionedBlock(100, 1000, 1, 1, 1L, (byte[]) null));
ShuffleDataFlushEvent event =
new ShuffleDataFlushEvent(1, appId, 1, 1, 1, 1000, blocks, null, null);
assertTrue((manager.selectStorage(event) instanceof HadoopStorage));

// case2: fallback is still valid when fallback_max_fail_time = 0
conf.setLong(ShuffleServerConf.FALLBACK_MAX_FAIL_TIMES, 0);
manager = new HybridStorageManager(conf);

localStorageManager = (LocalStorageManager) manager.getWarmStorageManager();
localStorageManager.getStorages().get(0).markCorrupted();

event = new ShuffleDataFlushEvent(1, appId, 1, 1, 1, 1000, blocks, null, null);
manager.registerRemoteStorage(appId, new RemoteStorageInfo(remoteStorage));
assertTrue((manager.selectStorage(event) instanceof HadoopStorage));
}

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