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.

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

[#2062][FOLLOWUP]Improvement(dashboard): Display detailed info for application in dashboard ui #2063

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions coordinator/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,10 @@
<groupId>org.apache.uniffle</groupId>
<artifactId>rss-server-common</artifactId>
</dependency>
<dependency>
<groupId>org.apache.uniffle</groupId>
<artifactId>shuffle-storage</artifactId>
</dependency>
<dependency>
<groupId>org.apache.uniffle</groupId>
<artifactId>rss-internal-client</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ public class AppInfo implements Comparable<AppInfo> {
private String appId;
private long updateTime;
private long registrationTime;
private long finishTime;
private String version;
private String gitCommitId;

Expand Down Expand Up @@ -67,6 +68,14 @@ public String getGitCommitId() {
return gitCommitId;
}

public void setFinishTime(long finishTime) {
this.finishTime = finishTime;
}

public long getFinishTime() {
return finishTime;
}

@Override
public int compareTo(AppInfo appInfo) {
return Long.compare(registrationTime, appInfo.getRegistrationTime());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@
import org.apache.uniffle.coordinator.strategy.storage.LowestIOSampleCostSelectStorageStrategy;
import org.apache.uniffle.coordinator.strategy.storage.RankValue;
import org.apache.uniffle.coordinator.strategy.storage.SelectStorageStrategy;
import org.apache.uniffle.coordinator.web.vo.AppInfoVO;

public class ApplicationManager implements Closeable {

Expand All @@ -78,6 +79,9 @@ public class ApplicationManager implements Closeable {
// it's only for test case to check if status check has problem
private boolean hasErrorInStatusCheck = false;

private CoordinatorServer coordinatorServer;
private CoordinatorAppHistoryManager coordinatorAppHistoryManager = null;

public ApplicationManager(CoordinatorConf conf) {
storageStrategy = conf.get(CoordinatorConf.COORDINATOR_REMOTE_STORAGE_SELECT_STRATEGY);
appIdToRemoteStorageInfo = JavaUtils.newConcurrentMap();
Expand Down Expand Up @@ -110,6 +114,9 @@ public ApplicationManager(CoordinatorConf conf) {
break;
}
}

coordinatorAppHistoryManager = CoordinatorAppHistoryManager.create(conf);

// the thread for checking application status
checkAppScheduler = ThreadUtils.getDaemonSingleThreadScheduledExecutor("ApplicationManager");
checkAppScheduler.scheduleAtFixedRate(
Expand Down Expand Up @@ -348,7 +355,16 @@ protected void statusCheck() {
if (System.currentTimeMillis() - lastReport.getUpdateTime() > expired) {
expiredAppIds.add(appId);
appAndTimes.remove(appId);
appIdToUser.remove(appId);
String user = appIdToUser.remove(appId);
if (coordinatorServer != null && user != null && coordinatorAppHistoryManager != null) {
lastReport.setFinishTime(System.currentTimeMillis());
AppInfoVO appInfoVO = coordinatorServer.getAppInfoV0(user, lastReport);
coordinatorAppHistoryManager.addAppInfo(appInfoVO);
// remove the remain appInfo in serverNode
for (ServerNode serverNode : coordinatorServer.getClusterManager().list()) {
serverNode.getAppIdToInfos().remove(appId);
}
}
}
}
}
Expand Down Expand Up @@ -546,13 +562,28 @@ public Map<String, Map<String, AppInfo>> getCurrentUserAndApp() {
return currentUserAndApp;
}

public List<AppInfoVO> getCachedAppInfos(int currentAppSize) {
return coordinatorAppHistoryManager.getAppInfos(currentAppSize);
}

public int getCachedAppInfosSize(int currentAppSize) {
return coordinatorAppHistoryManager.getAppInfosSize(currentAppSize);
}

public void close() {
if (detectStorageScheduler != null) {
detectStorageScheduler.shutdownNow();
}
if (checkAppScheduler != null) {
checkAppScheduler.shutdownNow();
}
if (coordinatorAppHistoryManager != null) {
coordinatorAppHistoryManager.close();
}
}

public void setCoordinatorServer(CoordinatorServer coordinatorServer) {
this.coordinatorServer = coordinatorServer;
}

public enum StrategyName {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,233 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

package org.apache.uniffle.coordinator;

import java.io.File;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.TimeUnit;

import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import org.apache.uniffle.common.filesystem.HadoopFilesystemProvider;
import org.apache.uniffle.coordinator.web.vo.AppInfoVO;
import org.apache.uniffle.storage.handler.impl.HadoopFileReader;
import org.apache.uniffle.storage.handler.impl.HadoopFileWriter;

public class CoordinatorAppHistoryManager {
private static final Logger LOG = LoggerFactory.getLogger(CoordinatorAppHistoryManager.class);
private final BlockingQueue<AppInfoVO> appInfoQueue;
private volatile boolean isRunning;
private final Map<String, AppInfoVO> cachedAppInfoMap;
private final int cachedAppInfoSize;
private final int dashboardAppInfoMaxSize;
private final CoordinatorConf conf;

private Path path = null;
private HadoopFileWriter hadoopFileWriter = null;
private int batchSize = 0;
private long flushIntervalMs = 0;

private static final ObjectMapper objectMapper = new ObjectMapper();

public CoordinatorAppHistoryManager(CoordinatorConf conf) throws Exception {
this.conf = conf;
this.isRunning = true;
this.appInfoQueue =
new LinkedBlockingQueue<>(
this.conf.getInteger(CoordinatorConf.COORDINATOR_APP_HISTORY_CACHE_MAX_SIZE));
this.cachedAppInfoSize =
this.conf.getInteger(CoordinatorConf.COORDINATOR_APP_HISTORY_CACHE_MAX_SIZE);
this.dashboardAppInfoMaxSize = this.cachedAppInfoSize;
this.cachedAppInfoMap =
new LinkedHashMap<String, AppInfoVO>(this.cachedAppInfoSize, 0.75f, true) {
@Override
protected boolean removeEldestEntry(Map.Entry<String, AppInfoVO> eldest) {
return size() > cachedAppInfoSize;
}
};
String historyFile = this.conf.getString(CoordinatorConf.COORDINATOR_APP_HISTORY_PATH);
if (historyFile != null && !historyFile.isEmpty()) {
// Convert relative path to absolute path
if (historyFile.startsWith("file://./")) {
String absPath = new File(historyFile.substring(7)).getAbsolutePath();
historyFile = "file://" + absPath;
}
this.path = new Path(historyFile);
FileSystem fileSystem =
HadoopFilesystemProvider.getFilesystem(
"rss_coordinator_app_history", path, this.conf.getHadoopConf());
this.hadoopFileWriter = new HadoopFileWriter(fileSystem, path, this.conf.getHadoopConf());
this.batchSize = this.conf.getInteger(CoordinatorConf.COORDINATOR_APP_HISTORY_BATCH_SIZE);
this.flushIntervalMs =
this.conf.getLong(CoordinatorConf.COORDINATOR_APP_HISTORY_FLUSH_INTERVAL_MS);
startPersistentThread();
loadAppInfo();
}
}

public void startPersistentThread() {
Thread persistentThread =
new Thread(
() -> {
while (isRunning) {
try {
persistentAppInfoBatch();
} catch (Exception e) {
LOG.error("Error in persistent thread", e);
}
}
});
persistentThread.setName("AppHistoryPersistentThread");
persistentThread.setDaemon(true);
persistentThread.start();
}

private void persistentAppInfoBatch() throws InterruptedException {
List<AppInfoVO> batch = new ArrayList<>(batchSize);
long startTime = System.currentTimeMillis();

while (batch.size() < batchSize && (System.currentTimeMillis() - startTime) < flushIntervalMs) {
AppInfoVO appInfoVO =
appInfoQueue.poll(
flushIntervalMs - (System.currentTimeMillis() - startTime), TimeUnit.MILLISECONDS);
if (appInfoVO != null) {
batch.add(appInfoVO);
} else {
break;
}
}

if (!batch.isEmpty()) {
persistentAppInfo(batch);
}
}

public synchronized void addAppInfo(AppInfoVO appInfoVO) {
cachedAppInfoMap.put(appInfoVO.getAppId(), appInfoVO);
if (!appInfoQueue.offer(appInfoVO)) {
LOG.warn(
"add app info to queue, appId: {}, but queue is full, size: {}",
appInfoVO.getAppId(),
appInfoQueue.size());
}
}

public void loadAppInfo() {
HadoopFileReader hadoopFileReader = null;
try {
hadoopFileReader = new HadoopFileReader(path, this.conf.getHadoopConf());
// read last N bytes, make sure to read the last cachedAppInfoSize AppInfoVOs
long readSize = cachedAppInfoSize * 1024L;
long fileSize = hadoopFileReader.getFileLen();
if (fileSize < readSize) {
readSize = fileSize;
}
long offset = fileSize - readSize;
byte[] data = hadoopFileReader.read(offset, (int) readSize);
String dataStr = new String(data, StandardCharsets.UTF_8);
String[] lines = dataStr.split("\n");
for (String line : lines) {
if (line.isEmpty()) {
continue;
}
try {
AppInfoVO appInfoVO = objectMapper.readValue(line, AppInfoVO.class);
cachedAppInfoMap.put(appInfoVO.getAppId(), appInfoVO);
} catch (JsonProcessingException e) {
LOG.warn("Skipping invalid JSON line: {}. Error: {}", line, e.getMessage(), e);
}
}
} catch (IllegalStateException e) {
LOG.error(
"load app info from {} failed, got IllegalStateException: {}", path, e.getMessage());
} catch (Exception e) {
LOG.error("load app info from {} failed, got Exception: {}", path, e.getMessage());
} finally {
if (hadoopFileReader != null) {
try {
hadoopFileReader.close();
} catch (IOException e) {
LOG.error("close hadoopFileReader from {} failed, Exception: {}", path, e.getMessage());
}
}
}
}

public void persistentAppInfo(List<AppInfoVO> appInfos) {
try {
for (AppInfoVO appInfoVO : appInfos) {
String jsonString = objectMapper.writeValueAsString(appInfoVO);
hadoopFileWriter.writeData(jsonString.getBytes(StandardCharsets.UTF_8));
hadoopFileWriter.writeData(
"\n"
.getBytes(
StandardCharsets.UTF_8)); // Add a newline character to separate JSON objects
}
hadoopFileWriter.flush();
} catch (IOException e) {
LOG.error("write data failed, Exception: {}", e.getMessage());
}
}

public void close() {
isRunning = false;
try {
hadoopFileWriter.close();
} catch (Exception e) {
LOG.error("close failed, Exception: {}", e.getMessage());
}
}

public List<AppInfoVO> getAppInfos(int currentAppSize) {
// get the last size AppInfoVOs
int needSize = Math.max(0, dashboardAppInfoMaxSize - currentAppSize);
if (cachedAppInfoMap.size() < needSize) {
return new ArrayList<>(cachedAppInfoMap.values());
}
return new ArrayList<>(cachedAppInfoMap.values())
.subList(cachedAppInfoMap.size() - needSize, cachedAppInfoMap.size());
}

public int getAppInfosSize(int currentAppSize) {
int needSize = Math.max(0, dashboardAppInfoMaxSize - currentAppSize);
return Math.min(cachedAppInfoMap.size(), needSize);
}

public static CoordinatorAppHistoryManager create(CoordinatorConf conf) {
if (conf.getBoolean(CoordinatorConf.COORDINATOR_APP_HISTORY_ENABLE)) {
try {
return new CoordinatorAppHistoryManager(conf);
} catch (Exception e) {
LOG.error("create app history manager failed, Exception: {}", e.getMessage());
}
}
return null;
}
}
Loading
Loading