Skip to content

[improvement](stats) Catch exception properly #22503

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
englefly merged 1 commit into from
Aug 3, 2023
Merged

[improvement](stats) Catch exception properly #22503

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions fe/fe-core/src/main/java/org/apache/doris/statistics/AnalysisManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,8 +174,7 @@ public void createAnalysisJobs(AnalyzeDBStmt analyzeDBStmt, boolean proxy) throw
}
}

public List<AnalysisInfo> buildAnalysisInfosForDB(DatabaseIf<TableIf> db, AnalyzeProperties analyzeProperties)
throws DdlException {
public List<AnalysisInfo> buildAnalysisInfosForDB(DatabaseIf<TableIf> db, AnalyzeProperties analyzeProperties) {
List<TableIf> tbls = db.getTables();
List<AnalysisInfo> analysisInfos = new ArrayList<>();
db.readLock();
Expand All @@ -195,12 +194,18 @@ public List<AnalysisInfo> buildAnalysisInfosForDB(DatabaseIf<TableIf> db, Analyz
try {
analyzeTblStmt.check();
} catch (AnalysisException analysisException) {
throw new DdlException(analysisException.getMessage(), analysisException);
LOG.warn("Failed to build analyze job: {}",
analysisException.getMessage(), analysisException);
}
analyzeStmts.add(analyzeTblStmt);
}
for (AnalyzeTblStmt analyzeTblStmt : analyzeStmts) {
analysisInfos.add(buildAndAssignJob(analyzeTblStmt));
try {
analysisInfos.add(buildAndAssignJob(analyzeTblStmt));
} catch (DdlException e) {
LOG.warn("Failed to build analyze job: {}",
e.getMessage(), e);
}
}
} finally {
db.readUnlock();
Expand Down
59 changes: 35 additions & 24 deletions fe/fe-core/src/main/java/org/apache/doris/statistics/StatisticsAutoAnalyzer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,8 @@ protected void runAfterCatalogReady() {
return;
}

analyzePeriodically();
if (!Config.enable_full_auto_analyze) {
analyzePeriodically();
analyzeAutomatically();
} else {
analyzeAll();
Expand All @@ -85,26 +85,28 @@ protected void runAfterCatalogReady() {
private void analyzeAll() {
Set<CatalogIf> catalogs = Env.getCurrentEnv().getCatalogMgr().getCopyOfCatalog();
for (CatalogIf ctl : catalogs) {
try {
Collection<DatabaseIf> dbs = ctl.getAllDbs();
for (DatabaseIf<TableIf> databaseIf : dbs) {
if (StatisticConstants.STATISTICS_DB_BLACK_LIST.contains(databaseIf.getFullName())) {

Collection<DatabaseIf> dbs = ctl.getAllDbs();
for (DatabaseIf<TableIf> databaseIf : dbs) {
if (StatisticConstants.STATISTICS_DB_BLACK_LIST.contains(databaseIf.getFullName())) {
continue;
}
AnalysisManager analysisManager = Env.getCurrentEnv().getAnalysisManager();
List<AnalysisInfo> analysisInfos = analysisManager.buildAnalysisInfosForDB(databaseIf,
AnalyzeProperties.DEFAULT_PROP);
for (AnalysisInfo analysisInfo : analysisInfos) {
analysisInfo = getReAnalyzeRequiredPart(analysisInfo);
if (analysisInfo == null) {
continue;
}
AnalysisManager analysisManager = Env.getCurrentEnv().getAnalysisManager();
List<AnalysisInfo> analysisInfos = analysisManager.buildAnalysisInfosForDB(databaseIf,
AnalyzeProperties.DEFAULT_PROP);
for (AnalysisInfo analysisInfo : analysisInfos) {
analysisInfo = getReAnalyzeRequiredPart(analysisInfo);
if (analysisInfo == null) {
continue;
}
try {
analysisManager.createSystemAnalysisJob(analysisInfo, analysisTaskExecutor);
} catch (Exception e) {
LOG.warn("Failed to create analysis job", e);
}
}
} catch (Throwable t) {
LOG.warn("Failed to analyze all statistics.", t);
}

}

analyzePeriodically();
Expand Down Expand Up @@ -160,16 +162,20 @@ private void analyzeAutomatically() {
* @return new job info after check
* @throws Throwable failed to check
*/
private AnalysisInfo getReAnalyzeRequiredPart(AnalysisInfo jobInfo) throws Throwable {
private AnalysisInfo getReAnalyzeRequiredPart(AnalysisInfo jobInfo) {
long lastExecTimeInMs = jobInfo.lastExecTimeInMs;
TableIf table = StatisticsUtil
.findTable(jobInfo.catalogName, jobInfo.dbName, jobInfo.tblName);
TableStatistic tblStats = StatisticsRepository.fetchTableLevelStats(table.getId());
TableStatistic tblStats = null;
try {
tblStats = StatisticsRepository.fetchTableLevelStats(table.getId());
} catch (Throwable t) {
LOG.warn("Failed to fetch table stats", t);
return null;
}

if (tblStats == TableStatistic.UNKNOWN) {
LOG.warn("Failed to automatically analyze statistics, "
+ "no corresponding table statistics for job: {}", jobInfo.toString());
throw new DdlException("No corresponding table statistics for automatic job.");
return jobInfo;
}

if (!needReanalyzeTable(table, tblStats)) {
Expand Down Expand Up @@ -200,7 +206,7 @@ private boolean needReanalyzeTable(TableIf table, TableStatistic tblStats) {
}

private void checkAnalyzedPartitions(TableIf table, Set<String> statsPartitions,
Set<String> needRunPartitions, long lastExecTimeInMs) throws DdlException {
Set<String> needRunPartitions, long lastExecTimeInMs) {
for (String statsPartition : statsPartitions) {
Partition partition = table.getPartition(statsPartition);
if (partition == null) {
Expand All @@ -209,12 +215,17 @@ private void checkAnalyzedPartitions(TableIf table, Set<String> statsPartitions,
needRunPartitions.add(statsPartition);
continue;
}
TableStatistic partitionStats = StatisticsRepository
TableStatistic partitionStats = null;
try {
partitionStats = StatisticsRepository
.fetchTableLevelOfPartStats(partition.getId());
if (partitionStats == TableStatistic.UNKNOWN) {
} catch (DdlException e) {
LOG.warn("Failed to fetch part stats", e);
continue;
}
if (needReanalyzePartition(lastExecTimeInMs, partition, partitionStats)) {

if (needReanalyzePartition(lastExecTimeInMs, partition, partitionStats)
|| partitionStats == TableStatistic.UNKNOWN) {
needRunPartitions.add(partition.getName());
}
}
Expand Down