From 69eb02b96f1f2db6c217716469aa0e2f6af4a91e Mon Sep 17 00:00:00 2001 From: walter Date: Fri, 8 Nov 2024 14:05:50 +0800 Subject: [PATCH] [chore](restore) Save restore stmt to the resp if RestoreSnapshot failed #42933 (#42985) cherry pick from #42933 --- .../org/apache/doris/service/FrontendServiceImpl.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/fe/fe-core/src/main/java/org/apache/doris/service/FrontendServiceImpl.java b/fe/fe-core/src/main/java/org/apache/doris/service/FrontendServiceImpl.java index de3cc8ce8c8ad7..d37e54deba8965 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/service/FrontendServiceImpl.java +++ b/fe/fe-core/src/main/java/org/apache/doris/service/FrontendServiceImpl.java @@ -3136,7 +3136,7 @@ private TRestoreSnapshotResult restoreSnapshotImpl(TRestoreSnapshotRequest reque RestoreStmt restoreStmt = new RestoreStmt(label, repoName, restoreTableRefClause, properties, request.getMeta(), request.getJobInfo()); restoreStmt.setIsBeingSynced(); - LOG.trace("restore snapshot info, restoreStmt: {}", restoreStmt); + LOG.debug("restore snapshot info, restoreStmt: {}", restoreStmt); try { ConnectContext ctx = new ConnectContext(); ctx.setQualifiedUser(request.getUser()); @@ -3147,13 +3147,13 @@ private TRestoreSnapshotResult restoreSnapshotImpl(TRestoreSnapshotRequest reque restoreStmt.analyze(analyzer); DdlExecutor.execute(Env.getCurrentEnv(), restoreStmt); } catch (UserException e) { - LOG.warn("failed to restore: {}", e.getMessage(), e); + LOG.warn("failed to restore: {}, stmt: {}", e.getMessage(), restoreStmt, e); status.setStatusCode(TStatusCode.ANALYSIS_ERROR); - status.addToErrorMsgs(e.getMessage()); + status.addToErrorMsgs(e.getMessage() + ", stmt: " + restoreStmt.toString()); } catch (Throwable e) { - LOG.warn("catch unknown result.", e); + LOG.warn("catch unknown result. stmt: {}", restoreStmt, e); status.setStatusCode(TStatusCode.INTERNAL_ERROR); - status.addToErrorMsgs(Strings.nullToEmpty(e.getMessage())); + status.addToErrorMsgs(Strings.nullToEmpty(e.getMessage()) + ", stmt: " + restoreStmt.toString()); } finally { ConnectContext.remove(); }