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 93da0ebaf42 [chore](backup) limit the involved tablets in a backup job
#39987 (#40080)
93da0ebaf42 is described below
commit 93da0ebaf428e0979bfeeb7794b2ed83890482a0
Author: walter <[email protected]>
AuthorDate: Thu Aug 29 12:03:14 2024 +0800
[chore](backup) limit the involved tablets in a backup job #39987 (#40080)
cherry pick from #39987
---
.../src/main/java/org/apache/doris/common/Config.java | 9 +++++++++
.../src/main/java/org/apache/doris/backup/BackupJob.java | 11 +++++++++++
2 files changed, 20 insertions(+)
diff --git a/fe/fe-common/src/main/java/org/apache/doris/common/Config.java
b/fe/fe-common/src/main/java/org/apache/doris/common/Config.java
index 5e0cb99b638..d5939715f3e 100644
--- a/fe/fe-common/src/main/java/org/apache/doris/common/Config.java
+++ b/fe/fe-common/src/main/java/org/apache/doris/common/Config.java
@@ -1526,6 +1526,15 @@ public class Config extends ConfigBase {
@ConfField(mutable = true, masterOnly = true)
public static int max_backup_restore_job_num_per_db = 10;
+ /**
+ * Control the max num of tablets per backup job involved.
+ */
+ @ConfField(mutable = true, masterOnly = true, description = {
+ "用于控制每次 backup job 允许备份的 tablet 上限，以避免 OOM",
+ "Control the max num of tablets per backup job involved, to avoid OOM"
+ })
+ public static int max_backup_tablets_per_job = 300000;
+
/**
* whether to ignore table that not support type when backup, and not
report exception.
*/
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 9b3edbad527..4dc8824d052 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
@@ -513,6 +513,17 @@ public class BackupJob extends AbstractJob {
}
}
+ // Limit the max num of tablets involved in a backup job, to avoid OOM.
+ if (unfinishedTaskIds.size() > Config.max_backup_tablets_per_job) {
+ String msg = String.format("the num involved tablets %d exceeds
the limit %d, "
+ + "which might cause the FE OOM, change config
`max_backup_tablets_per_job` "
+ + "to change this limitation",
+ unfinishedTaskIds.size(),
Config.max_backup_tablets_per_job);
+ LOG.warn(msg);
+ status = new Status(ErrCode.COMMON_ERROR, msg);
+ return;
+ }
+
backupMeta = new BackupMeta(copiedTables, copiedResources);
// send tasks
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
