zuston commented on code in PR #424:
URL: https://github.com/apache/incubator-uniffle/pull/424#discussion_r1054312239
##########
server/src/main/java/org/apache/uniffle/server/storage/LocalStorageManager.java:
##########
@@ -139,33 +143,53 @@ public class LocalStorageManager extends
SingleStorageManager {
@Override
public Storage selectStorage(ShuffleDataFlushEvent event) {
- LocalStorage storage =
localStorages.get(ShuffleStorageUtils.getStorageIndex(
- localStorages.size(),
- event.getAppId(),
- event.getShuffleId(),
- event.getStartPartition()));
- if (storage.containsWriteHandler(event.getAppId(), event.getShuffleId(),
event.getStartPartition())
- && storage.isCorrupted()) {
- LOG.error("storage " + storage.getBasePath() + " is corrupted");
- }
- if (storage.isCorrupted()) {
- storage = getRepairedStorage(event.getAppId(), event.getShuffleId(),
event.getStartPartition());
+ String appId = event.getAppId();
+ int shuffleId = event.getShuffleId();
+ int partitionId = event.getStartPartition();
+
+ LocalStorage storage = partitionsOfStorage.get(UnionKey.toKey(appId,
shuffleId, partitionId));
+ if (storage != null) {
+ if (storage.isCorrupted()) {
+ if (storage.containsWriteHandler(appId, shuffleId, partitionId)) {
+ throw new RuntimeException("LocalStorage: " + storage.getBasePath()
+ " is corrupted.");
+ }
+ } else {
+ return storage;
+ }
}
- event.setUnderStorage(storage);
- return storage;
+
+ List<LocalStorage> candidates = localStorages
+ .stream()
+ .filter(x -> x.canWrite() && !x.isCorrupted())
+ .collect(Collectors.toList());
+ final LocalStorage selectedStorage = candidates.get(
+ ShuffleStorageUtils.getStorageIndex(
+ candidates.size(),
+ appId,
+ shuffleId,
+ partitionId
+ )
+ );
+ return partitionsOfStorage.compute(
+ UnionKey.toKey(appId, shuffleId, partitionId),
+ (key, localStorage) -> {
+ // If this is the first time to select storage or existing storage
is corrupted,
+ // we should refresh the cache.
+ if (localStorage == null || localStorage.isCorrupted()) {
Review Comment:
> Previously L154-L156 throws an exception, I cannot image in which case,
the localStorage.isCorrupted holds true
In the previous version commit, when `localStorage.isCorrupted() == true`
and `storage.containsWriteHandler(appId, shuffleId, partitionId) == false`, the
code will enter the part you mentioned.
Do I catch you thought?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
