diff --git a/fe/src/main/java/org/apache/doris/alter/SystemHandler.java b/fe/src/main/java/org/apache/doris/alter/SystemHandler.java index fc0265bc7b6450..e951f3439a4424 100644 --- a/fe/src/main/java/org/apache/doris/alter/SystemHandler.java +++ b/fe/src/main/java/org/apache/doris/alter/SystemHandler.java @@ -39,6 +39,7 @@ import org.apache.doris.catalog.Table; import org.apache.doris.catalog.Table.TableType; import org.apache.doris.common.Config; +import org.apache.doris.common.AnalysisException; import org.apache.doris.common.DdlException; import org.apache.doris.common.MetaNotFoundException; import org.apache.doris.common.Pair; @@ -279,7 +280,13 @@ public static Map> checkDecommission(List dbNames = Catalog.getInstance().getDbNames(); + List dbNames; + try { + dbNames = Catalog.getInstance().getClusterDbNames(clusterName); + } catch (AnalysisException e) { + throw new DdlException(e.getMessage()); + } + for (String dbName : dbNames) { Database db = Catalog.getInstance().getDb(dbName); if (db == null) {