This is an automated email from the ASF dual-hosted git repository.
w41ter pushed a commit to branch branch-2.1
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-2.1 by this push:
new c1437ea192b branch-2.1: [improve](backup) Limit the output size of
show backup/restore job progress #44681 (#44707)
c1437ea192b is described below
commit c1437ea192b56adcabb1e4525c7d9c08ac4a3223
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Thu Nov 28 14:27:34 2024 +0800
branch-2.1: [improve](backup) Limit the output size of show backup/restore
job progress #44681 (#44707)
Cherry-picked from #44681
Co-authored-by: walter <[email protected]>
---
.../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 3081c401bc8..93057455d2d 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
@@ -558,7 +558,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();
@@ -567,7 +567,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 1c1d5e7052e..05349cbcc28 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
@@ -1063,6 +1063,19 @@ public class BackupJob extends AbstractJob {
}
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);
@@ -1073,12 +1086,9 @@ public class BackupJob extends AbstractJob {
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 f58a9b1f03e..fe0a2438e83 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
@@ -2174,6 +2174,11 @@ public class RestoreJob extends AbstractJob {
}
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);
@@ -2193,13 +2198,18 @@ public class RestoreJob extends AbstractJob {
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: [email protected]
For additional commands, e-mail: [email protected]
