smallzhongfeng commented on code in PR #680:
URL: https://github.com/apache/incubator-uniffle/pull/680#discussion_r1125846554
##########
coordinator/src/main/java/org/apache/uniffle/coordinator/strategy/storage/AbstractSelectStorageStrategy.java:
##########
@@ -76,6 +102,72 @@ public void readAndWriteHdfsStorage(FileSystem fs, Path
testPath,
}
}
+ @Override
+ public void detectStorage() {
+ uris =
Lists.newCopyOnWriteArrayList(remoteStoragePathRankValue.entrySet());
+ if (remoteStoragePathRankValue.size() > 1) {
+ CountDownLatch countDownLatch = new CountDownLatch(uris.size());
+ uris.parallelStream().forEach(uri -> {
+ if
(uri.getKey().startsWith(ApplicationManager.getPathSchema().get(0))) {
+ Path remotePath = new Path(uri.getKey());
+ String rssTest = uri.getKey() + "/rssTest-" + getCoordinatorId()
+ + Thread.currentThread().getName();
+ Path testPath = new Path(rssTest);
+ RankValue rankValue = remoteStoragePathRankValue.get(uri.getKey());
+ rankValue.setHealthy(new AtomicBoolean(true));
+ long startWriteTime = System.currentTimeMillis();
+ try {
+ FileSystem fs = HadoopFilesystemProvider.getFilesystem(remotePath,
hdfsConf);
+ for (int j = 0; j < readAndWriteTimes; j++) {
+ readAndWriteHdfsStorage(fs, testPath, uri.getKey(), rankValue);
+ }
+ } catch (Exception e) {
+ LOG.error("Storage read and write error, we will not use this
remote path {}.", uri, e);
+ rankValue.setHealthy(new AtomicBoolean(false));
+ } finally {
+ sortPathByRankValue(uri.getKey(), rssTest, startWriteTime);
+ }
+ countDownLatch.countDown();
+ }
+ });
+ try {
+ countDownLatch.await();
+ } catch (InterruptedException e) {
+ LOG.error("Failed to detectStorage!");
+ }
+ }
+ }
+
+ @VisibleForTesting
+ public void sortPathByRankValue(
+ String path, String testPath, long startWrite) {
+ RankValue rankValue = remoteStoragePathRankValue.get(path);
+ try {
+ FileSystem fs = HadoopFilesystemProvider.getFilesystem(new Path(path),
hdfsConf);
+ fs.delete(new Path(testPath), true);
+ if (rankValue.getHealthy().get()) {
+ rankValue.setCostTime(new AtomicLong(System.currentTimeMillis() -
startWrite));
+ }
+ } catch (Exception e) {
+ rankValue.setCostTime(new AtomicLong(Long.MAX_VALUE));
+ LOG.error("Failed to sort, we will not use this remote path {}.", path,
e);
+ }
+
+ if (this.getComparator() != null) {
+ uris = Lists.newCopyOnWriteArrayList(
+ remoteStoragePathRankValue.entrySet()).stream().filter(
+
Objects::nonNull).sorted(this.getComparator()).collect(Collectors.toList());
+ } else {
+ uris = Lists.newCopyOnWriteArrayList(
+ remoteStoragePathRankValue.entrySet()).stream().filter(
+ Objects::nonNull).collect(Collectors.toList());
+ }
+ LOG.info("The sorted remote path list is: {}", uris);
+ }
+
+ @Override
+ public abstract Comparator<Map.Entry<String, RankValue>> getComparator();
Review Comment:
Added.
##########
coordinator/src/main/java/org/apache/uniffle/coordinator/strategy/storage/SelectStorageStrategy.java:
##########
@@ -17,11 +17,15 @@
package org.apache.uniffle.coordinator.strategy.storage;
+import java.util.Comparator;
+
import org.apache.uniffle.common.RemoteStorageInfo;
public interface SelectStorageStrategy {
void detectStorage();
RemoteStorageInfo pickStorage(String appId);
+
+ Comparator getComparator();
Review Comment:
Done.
--
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]
