This is an automated email from the ASF dual-hosted git repository.
w41ter pushed a commit to branch branch-3.0
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-3.0 by this push:
new a324dcc22d5 branch-3.0: [improve](backup) Limit the output size of
show backup/restore job progress #44681 (#44706)
a324dcc22d5 is described below
commit a324dcc22d5e0498211e80c9334fbd18597162b7
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Thu Nov 28 12:00:45 2024 +0800
branch-3.0: [improve](backup) Limit the output size of show backup/restore
job progress #44681 (#44706)
Cherry-picked from #44681
Co-authored-by: walter <maoch...@selectdb.com>
---
.../java/org/apache/doris/alter/RollupJobV2.java | 4 ++--
.../java/org/apache/doris/backup/BackupJob.java | 22 ++++++++++++++++------
.../java/org/apache/doris/backup/RestoreJob.java | 22 ++++++++++++++++------
3 files changed, 34 insertions(+), 14 deletions(-)
diff --git a/fe/fe-core/src/main/java/org/apache/doris/alter/RollupJobV2.java
b/fe/fe-core/src/main/java/org/apache/doris/alter/RollupJobV2.java
index 1ff74d4cb81..48ed1146ea1 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/alter/RollupJobV2.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/alter/RollupJobV2.java
@@ -569,7 +569,7 @@ public class RollupJobV2 extends AlterJobV2 implements
GsonPostProcessable {
continue;
}
- long visiableVersion = partition.getVisibleVersion();
+ long visibleVersion = partition.getVisibleVersion();
short expectReplicationNum =
tbl.getPartitionInfo().getReplicaAllocation(
partitionId).getTotalReplicaNum();
MaterializedIndex rollupIndex = entry.getValue();
@@ -578,7 +578,7 @@ public class RollupJobV2 extends AlterJobV2 implements
GsonPostProcessable {
int healthyReplicaNum = 0;
for (Replica replica : replicas) {
if (!replica.isBad() && replica.getLastFailedVersion()
< 0
- &&
replica.checkVersionCatchUp(visiableVersion, false)) {
+ && replica.checkVersionCatchUp(visibleVersion,
false)) {
healthyReplicaNum++;
}
}
diff --git a/fe/fe-core/src/main/java/org/apache/doris/backup/BackupJob.java
b/fe/fe-core/src/main/java/org/apache/doris/backup/BackupJob.java
index 621a2b1d9f7..d0a957dcd9a 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/backup/BackupJob.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/backup/BackupJob.java
@@ -1059,6 +1059,19 @@ public class BackupJob extends AbstractJob implements
GsonPostProcessable {
}
public synchronized List<String> getInfo() {
+ String unfinishedTaskIdsStr = unfinishedTaskIds.entrySet().stream()
+ .map(e -> "[" + e.getKey() + "=" + e.getValue() + "]")
+ .limit(100)
+ .collect(Collectors.joining(", "));
+ String taskProgressStr = taskProgress.entrySet().stream()
+ .map(e -> "[" + e.getKey() + ": " + e.getValue().first + "/" +
e.getValue().second + "]")
+ .limit(100)
+ .collect(Collectors.joining(", "));
+ String taskErrMsgStr = taskErrMsg.entrySet().stream()
+ .map(e -> "[" + e.getKey() + ": " + e.getValue() + "]")
+ .limit(100)
+ .collect(Collectors.joining(", "));
+
List<String> info = Lists.newArrayList();
info.add(String.valueOf(jobId));
info.add(label);
@@ -1069,12 +1082,9 @@ public class BackupJob extends AbstractJob implements
GsonPostProcessable {
info.add(TimeUtils.longToTimeString(snapshotFinishedTime));
info.add(TimeUtils.longToTimeString(snapshotUploadFinishedTime));
info.add(TimeUtils.longToTimeString(finishedTime));
- info.add(Joiner.on(", ").join(unfinishedTaskIds.entrySet()));
- info.add(Joiner.on(", ").join(taskProgress.entrySet().stream().map(
- e -> "[" + e.getKey() + ": " + e.getValue().first + "/" +
e.getValue().second + "]").collect(
- Collectors.toList())));
- info.add(Joiner.on(", ").join(taskErrMsg.entrySet().stream().map(n ->
"[" + n.getKey() + ": " + n.getValue()
- + "]").collect(Collectors.toList())));
+ info.add(unfinishedTaskIdsStr);
+ info.add(taskProgressStr);
+ info.add(taskErrMsgStr);
info.add(status.toString());
info.add(String.valueOf(timeoutMs / 1000));
return info;
diff --git a/fe/fe-core/src/main/java/org/apache/doris/backup/RestoreJob.java
b/fe/fe-core/src/main/java/org/apache/doris/backup/RestoreJob.java
index a984eed5950..d230f7d52d4 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/backup/RestoreJob.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/backup/RestoreJob.java
@@ -2207,6 +2207,11 @@ public class RestoreJob extends AbstractJob implements
GsonPostProcessable {
}
public synchronized List<String> getInfo(boolean isBrief) {
+ String unfinishedTaskIdsStr =
unfinishedSignatureToId.entrySet().stream()
+ .map(e -> "[" + e.getKey() + "=" + e.getValue() + "]")
+ .limit(100)
+ .collect(Collectors.joining(", "));
+
List<String> info = Lists.newArrayList();
info.add(String.valueOf(jobId));
info.add(label);
@@ -2226,13 +2231,18 @@ public class RestoreJob extends AbstractJob implements
GsonPostProcessable {
info.add(TimeUtils.longToTimeString(snapshotFinishedTime));
info.add(TimeUtils.longToTimeString(downloadFinishedTime));
info.add(TimeUtils.longToTimeString(finishedTime));
- info.add(Joiner.on(", ").join(unfinishedSignatureToId.entrySet()));
+ info.add(unfinishedTaskIdsStr);
if (!isBrief) {
- info.add(Joiner.on(", ").join(taskProgress.entrySet().stream().map(
- e -> "[" + e.getKey() + ": " + e.getValue().first + "/" +
e.getValue().second + "]").collect(
- Collectors.toList())));
- info.add(Joiner.on(", ").join(taskErrMsg.entrySet().stream().map(n
-> "[" + n.getKey() + ": "
- + n.getValue() + "]").collect(Collectors.toList())));
+ String taskProgressStr = taskProgress.entrySet().stream()
+ .map(e -> "[" + e.getKey() + ": " + e.getValue().first +
"/" + e.getValue().second + "]")
+ .limit(100)
+ .collect(Collectors.joining(", "));
+ String taskErrMsgStr = taskErrMsg.entrySet().stream()
+ .map(n -> "[" + n.getKey() + ": " + n.getValue() + "]")
+ .limit(100)
+ .collect(Collectors.joining(", "));
+ info.add(taskProgressStr);
+ info.add(taskErrMsgStr);
}
info.add(status.toString());
info.add(String.valueOf(timeoutMs / 1000));
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
