From ed9d8ca699dd0f3ec09d4762f9bf6164af0ac3bf Mon Sep 17 00:00:00 2001 From: Luwei Date: Tue, 13 May 2025 00:57:41 +0800 Subject: [PATCH 1/2] [fix](cooldown) allow cooldown_ttl = 0 when altering storage policy --- .../src/main/java/org/apache/doris/policy/StoragePolicy.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/fe/fe-core/src/main/java/org/apache/doris/policy/StoragePolicy.java b/fe/fe-core/src/main/java/org/apache/doris/policy/StoragePolicy.java index ba2e0d5c59218e..6a257f52a0e872 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/policy/StoragePolicy.java +++ b/fe/fe-core/src/main/java/org/apache/doris/policy/StoragePolicy.java @@ -304,6 +304,7 @@ public static long getSecondsByCooldownTtl(String cooldownTtl) throws AnalysisEx LOG.error("cooldownTtl can't be less than 0"); throw new AnalysisException("cooldownTtl can't be less than 0"); } + return cooldownTtlSeconds; } @@ -346,10 +347,10 @@ public void modifyProperties(Map properties) throws DdlException } } - if (cooldownTtlMs > 0 && cooldownTimestampMs > 0) { + if (cooldownTtlMs >= 0 && cooldownTimestampMs >= 0) { throw new AnalysisException(COOLDOWN_DATETIME + " and " + COOLDOWN_TTL + " can't be set together."); } - if (cooldownTtlMs <= 0 && cooldownTimestampMs <= 0) { + if (cooldownTtlMs < 0 && cooldownTimestampMs < 0) { throw new AnalysisException(COOLDOWN_DATETIME + " or " + COOLDOWN_TTL + " must be set"); } From 9a259d412cea6f67a65a5d04333f90a67cd989de Mon Sep 17 00:00:00 2001 From: Luwei Date: Tue, 13 May 2025 00:58:41 +0800 Subject: [PATCH 2/2] fix --- .../src/main/java/org/apache/doris/policy/StoragePolicy.java | 1 - 1 file changed, 1 deletion(-) diff --git a/fe/fe-core/src/main/java/org/apache/doris/policy/StoragePolicy.java b/fe/fe-core/src/main/java/org/apache/doris/policy/StoragePolicy.java index 6a257f52a0e872..6e21a711e85eca 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/policy/StoragePolicy.java +++ b/fe/fe-core/src/main/java/org/apache/doris/policy/StoragePolicy.java @@ -304,7 +304,6 @@ public static long getSecondsByCooldownTtl(String cooldownTtl) throws AnalysisEx LOG.error("cooldownTtl can't be less than 0"); throw new AnalysisException("cooldownTtl can't be less than 0"); } - return cooldownTtlSeconds; }