[log](s3) return detailed error message to the user

kaijchen · Aug 19, 2024 · c9a52ba · c9a52ba
1 parent 21b3228
commit c9a52ba
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 6 deletions.
diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/CreateStageStmt.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/CreateStageStmt.java
@@ -114,8 +114,14 @@ private void checkObjectStorageInfo() throws UserException {
  } catch (Exception e) {
  LOG.warn("Failed to access object storage, proto={}, err={}",
  stageProperties.getObjectStoreInfoPB(), e.toString());
+ String msg;
+ if (e instanceof UserException ue) {
+ msg = ue.getDetailMessage();
+ } else {
+ msg = e.getMessage();
+ }
  throw new UserException(InternalErrorCode.GET_REMOTE_DATA_ERROR,
- "Failed to access object storage", e);
+ "Failed to access object storage, message=" + msg, e);
  } finally {
  if (remote != null) {
  remote.close();

diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/LoadStmt.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/LoadStmt.java
@@ -608,7 +608,14 @@ private void checkEndpoint(String endpoint) throws UserException {
  connection.connect();
  } catch (Exception e) {
  LOG.warn("Failed to connect endpoint={}, err={}", endpoint, e);
- throw new UserException("Failed to access object storage", e);
+ String msg;
+ if (e instanceof UserException ue) {
+ msg = ue.getDetailMessage();
+ } else {
+ msg = e.getMessage();
+ }
+ throw new UserException(InternalErrorCode.GET_REMOTE_DATA_ERROR,
+ "Failed to access object storage, message=" + msg, e);
  } finally {
  if (connection != null) {
  try {
@@ -674,8 +681,14 @@ private void checkAkSk() throws UserException {
  }
  } catch (Exception e) {
  LOG.warn("Failed to access object storage, file={}, proto={}, err={}", curFile, objectInfo, e.toString());
+ String msg;
+ if (e instanceof UserException ue) {
+ msg = ue.getDetailMessage();
+ } else {
+ msg = e.getMessage();
+ }
  throw new UserException(InternalErrorCode.GET_REMOTE_DATA_ERROR,
- "Failed to access object storage", e);
+ "Failed to access object storage, message=" + msg, e);
  } finally {
  if (remote != null) {
  remote.close();

diff --git a/...ession-test/suites/load_p0/broker_load/test_domain_connection_and_ak_sk_correction.groovy b/...ession-test/suites/load_p0/broker_load/test_domain_connection_and_ak_sk_correction.groovy
@@ -100,7 +100,7 @@ suite("test_domain_connection_and_ak_sk_correction", "load_p0") {
  assertTrue(false. "The endpoint is wrong, so the connection test should fale")
  } catch (Exception e) {
  logger.info("the second sql exception result is {}", e.getMessage())
- assertTrue(e.getMessage().contains("Failed to access object storage"), e.getMessage())
+ assertTrue(e.getMessage().contains("Failed to access object storage, message="), e.getMessage())
  }
 
  label = UUID.randomUUID().toString().replace("-", "")
@@ -125,7 +125,7 @@ suite("test_domain_connection_and_ak_sk_correction", "load_p0") {
  assertTrue(false. "AK is wrong, so the correction of AKSK test should fale")
  } catch (Exception e) {
  logger.info("the third sql exception result is {}", e.getMessage())
- assertTrue(e.getMessage().contains("Failed to access object storage"), e.getMessage())
+ assertTrue(e.getMessage().contains("Failed to access object storage, message="), e.getMessage())
  }
 
  label = UUID.randomUUID().toString().replace("-", "")
@@ -154,7 +154,7 @@ suite("test_domain_connection_and_ak_sk_correction", "load_p0") {
  assertTrue(false. "in the second DATA INFILE, the first bucket is wrong, so the sql should fail")
  } catch (Exception e) {
  logger.info("the fourth sql exception result is {}", e.getMessage())
- assertTrue(e.getMessage().contains("Failed to access object storage"), e.getMessage())
+ assertTrue(e.getMessage().contains("Failed to access object storage, message="), e.getMessage())
  }
  sql """ DROP TABLE IF EXISTS ${tableName} FORCE"""
  sql """ DROP TABLE IF EXISTS ${tableNameOrders} FORCE"""