This is an automated email from the ASF dual-hosted git repository. yiguolei 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 700d9aed44f branch-2.1: [fix](test) add debug info (#47170) 700d9aed44f is described below commit 700d9aed44f007b0a07b9776bd2875b9af442b74 Author: Mingyu Chen (Rayner) <morning...@163.com> AuthorDate: Sun Jan 19 10:53:13 2025 +0800 branch-2.1: [fix](test) add debug info (#47170) And some debug info to trace the issue when creating catalog with use_meta_cache=false and sometimes the database list can not be fetched. --- .../org/apache/doris/datasource/ExternalCatalog.java | 9 +++++++++ .../org/apache/doris/datasource/ExternalDatabase.java | 9 +++++++++ .../java/org/apache/doris/datasource/InitCatalogLog.java | 15 +++++++++++++++ .../org/apache/doris/datasource/InitDatabaseLog.java | 16 ++++++++++++++++ 4 files changed, 49 insertions(+) diff --git a/fe/fe-core/src/main/java/org/apache/doris/datasource/ExternalCatalog.java b/fe/fe-core/src/main/java/org/apache/doris/datasource/ExternalCatalog.java index f9cd27baa81..778c110df0b 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/datasource/ExternalCatalog.java +++ b/fe/fe-core/src/main/java/org/apache/doris/datasource/ExternalCatalog.java @@ -372,6 +372,9 @@ public abstract class ExternalCatalog initCatalogLog.setCatalogId(id); initCatalogLog.setType(logType); List<Pair<String, String>> remoteToLocalPairs = getFilteredDatabaseNames(); + if (LOG.isDebugEnabled()) { + LOG.debug("filtered database names in catalog {}: {}", getName(), remoteToLocalPairs); + } for (Pair<String, String> pair : remoteToLocalPairs) { String remoteDbName = pair.key(); String localDbName = pair.value(); @@ -400,6 +403,9 @@ public abstract class ExternalCatalog idToDb = tmpIdToDb; lastUpdateTime = System.currentTimeMillis(); initCatalogLog.setLastUpdateTime(lastUpdateTime); + if (LOG.isDebugEnabled()) { + LOG.debug("init catalog[{}] log: {}", name, initCatalogLog); + } Env.getCurrentEnv().getEditLog().logInitCatalog(initCatalogLog); } @@ -717,6 +723,9 @@ public abstract class ExternalCatalog } public void replayInitCatalog(InitCatalogLog log) { + if (LOG.isDebugEnabled()) { + LOG.debug("replay init external catalog[{}]: {}", name, log); + } // If the remote name is missing during upgrade, all databases in the Map will be reinitialized. if (log.getCreateCount() > 0 && (log.getRemoteDbNames() == null || log.getRemoteDbNames().isEmpty())) { dbNameToId = Maps.newConcurrentMap(); diff --git a/fe/fe-core/src/main/java/org/apache/doris/datasource/ExternalDatabase.java b/fe/fe-core/src/main/java/org/apache/doris/datasource/ExternalDatabase.java index cbacf563c32..9041f4d39ad 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/datasource/ExternalDatabase.java +++ b/fe/fe-core/src/main/java/org/apache/doris/datasource/ExternalDatabase.java @@ -190,6 +190,9 @@ public abstract class ExternalDatabase<T extends ExternalTable> } public void replayInitDb(InitDatabaseLog log, ExternalCatalog catalog) { + if (LOG.isDebugEnabled()) { + LOG.debug("replay init external db[{}.{}]: {}", name, catalog.getName(), log); + } // If the remote name is missing during upgrade, all tables in the Map will be reinitialized. if (log.getCreateCount() > 0 && (log.getRemoteTableNames() == null || log.getRemoteTableNames().isEmpty())) { tableNameToId = Maps.newConcurrentMap(); @@ -246,6 +249,9 @@ public abstract class ExternalDatabase<T extends ExternalTable> initDatabaseLog.setCatalogId(extCatalog.getId()); initDatabaseLog.setDbId(id); List<Pair<String, String>> tableNamePairs = listTableNames(); + if (LOG.isDebugEnabled()) { + LOG.debug("init external db[{}.{}] with tables[{}]", extCatalog.getName(), name, tableNamePairs); + } if (tableNamePairs != null) { Map<String, Long> tmpTableNameToId = Maps.newConcurrentMap(); Map<Long, T> tmpIdToTbl = Maps.newHashMap(); @@ -281,6 +287,9 @@ public abstract class ExternalDatabase<T extends ExternalTable> lastUpdateTime = System.currentTimeMillis(); initDatabaseLog.setLastUpdateTime(lastUpdateTime); + if (LOG.isDebugEnabled()) { + LOG.debug("init database[{}.{}] log: {}", extCatalog.name, name, initDatabaseLog); + } Env.getCurrentEnv().getEditLog().logInitExternalDb(initDatabaseLog); } diff --git a/fe/fe-core/src/main/java/org/apache/doris/datasource/InitCatalogLog.java b/fe/fe-core/src/main/java/org/apache/doris/datasource/InitCatalogLog.java index 9a1d4968d8f..50f713ce407 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/datasource/InitCatalogLog.java +++ b/fe/fe-core/src/main/java/org/apache/doris/datasource/InitCatalogLog.java @@ -103,4 +103,19 @@ public class InitCatalogLog implements Writable { String json = Text.readString(in); return GsonUtils.GSON.fromJson(json, InitCatalogLog.class); } + + @Override + public String toString() { + return "InitCatalogLog{" + + "catalogId=" + catalogId + + ", refreshCount=" + refreshCount + + ", createCount=" + createCount + + ", refreshDbIds=" + refreshDbIds + + ", createDbIds=" + createDbIds + + ", createDbNames=" + createDbNames + + ", remoteDbNames=" + remoteDbNames + + ", type=" + type + + ", lastUpdateTime=" + lastUpdateTime + + '}'; + } } diff --git a/fe/fe-core/src/main/java/org/apache/doris/datasource/InitDatabaseLog.java b/fe/fe-core/src/main/java/org/apache/doris/datasource/InitDatabaseLog.java index 9dff8c820bb..6284637d05d 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/datasource/InitDatabaseLog.java +++ b/fe/fe-core/src/main/java/org/apache/doris/datasource/InitDatabaseLog.java @@ -108,4 +108,20 @@ public class InitDatabaseLog implements Writable { String json = Text.readString(in); return GsonUtils.GSON.fromJson(json, InitDatabaseLog.class); } + + @Override + public String toString() { + return "InitDatabaseLog{" + + "catalogId=" + catalogId + + ", dbId=" + dbId + + ", refreshCount=" + refreshCount + + ", createCount=" + createCount + + ", refreshTableIds=" + refreshTableIds + + ", createTableIds=" + createTableIds + + ", createTableNames=" + createTableNames + + ", remoteTableNames=" + remoteTableNames + + ", type=" + type + + ", lastUpdateTime=" + lastUpdateTime + + '}'; + } } --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org For additional commands, e-mail: commits-h...@doris.apache.org