database/doris
2
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

[fix](proc) Fix bug that TrashProcDir cannot show backend trash detail normally (#10365)

Browse Source
This commit is contained in:
caiconghui
2022-06-24 08:56:32 +08:00
committed by GitHub
parent d5be190cf9
commit e3d549cdfa
1 changed files with 6 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
fe/fe-core/src/main/java/org/apache/doris/common/proc/TrashProcDir.java
View File

@ -26,7 +26,6 @@ import org.apache.doris.system.Backend;
import org.apache.doris.thrift.BackendService;
import org.apache.doris.thrift.TNetworkAddress;
import com.google.common.base.Strings;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Lists;
@ -73,7 +72,6 @@ public class TrashProcDir implements ProcDirInterface {
}
public static void getTrashInfo(List<Backend> backends, List<List<String>> infos) {
for (Backend backend : backends) {
BackendService.Client client = null;
TNetworkAddress address = null;
@ -114,23 +112,17 @@ public class TrashProcDir implements ProcDirInterface {
}
@Override
public ProcNodeInterface lookup(String backendHostAndPort) throws AnalysisException {
if (Strings.isNullOrEmpty(backendHostAndPort)) {
throw new AnalysisException("BackendHost:HeartBeatPort is null");
}
String backendHost;
int backendHeartBeatPort;
public ProcNodeInterface lookup(String backendIdStr) throws AnalysisException {
long backendId = -1;
try {
backendHost = backendHostAndPort.split(":")[0];
backendHeartBeatPort = Integer.parseInt(backendHostAndPort.split(":")[1]);
backendId = Long.parseLong(backendIdStr);
} catch (NumberFormatException e) {
throw new AnalysisException("Invalid backend format: " + backendHostAndPort);
throw new AnalysisException("Invalid backend id format: " + backendIdStr);
}
Backend backend = Catalog.getCurrentSystemInfo().getBackendWithHeartbeatPort(backendHost, backendHeartBeatPort);
Backend backend = Catalog.getCurrentSystemInfo().getBackend(backendId);
if (backend == null) {
throw new AnalysisException("Backend[" + backendHostAndPort + "] does not exist.");
throw new AnalysisException("Backend[" + backendId + "] does not exist.");
}
return new TrashProcNode(backend);
}
}