>From Wail Alkowaileet <[email protected]>:
Wail Alkowaileet has uploaded this change for review. (
https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/17979 )
Change subject: [ASTERIXDB-3319][COMP][RT] Throw external error in COPY TO
......................................................................
[ASTERIXDB-3319][COMP][RT] Throw external error in COPY TO
- user model changes: no
- storage format changes: no
- interface changes: no
Details:
Whenever we face an S3 misconfiguration (wrong region),
we throw internal error. Instead, we should report the
error as received from S3 SDK.
Change-Id: I21d9d4c91bdee50b86ab1bf6b2b06f23cf376a29
---
M
asterixdb/asterix-cloud/src/main/java/org/apache/asterix/cloud/writer/S3ExternalFileWriterFactory.java
M
asterixdb/asterix-cloud/src/main/java/org/apache/asterix/cloud/writer/AbstractCloudExternalFileWriter.java
2 files changed, 46 insertions(+), 7 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb
refs/changes/79/17979/1
diff --git
a/asterixdb/asterix-cloud/src/main/java/org/apache/asterix/cloud/writer/AbstractCloudExternalFileWriter.java
b/asterixdb/asterix-cloud/src/main/java/org/apache/asterix/cloud/writer/AbstractCloudExternalFileWriter.java
index fb8150b..04fa40b 100644
---
a/asterixdb/asterix-cloud/src/main/java/org/apache/asterix/cloud/writer/AbstractCloudExternalFileWriter.java
+++
b/asterixdb/asterix-cloud/src/main/java/org/apache/asterix/cloud/writer/AbstractCloudExternalFileWriter.java
@@ -18,6 +18,8 @@
*/
package org.apache.asterix.cloud.writer;
+import static org.apache.hyracks.api.util.ExceptionUtils.getMessageOrToString;
+
import org.apache.asterix.cloud.CloudOutputStream;
import org.apache.asterix.cloud.CloudResettableInputStream;
import org.apache.asterix.cloud.IWriteBufferProvider;
@@ -36,6 +38,8 @@
import com.google.common.base.Utf8;
+import software.amazon.awssdk.core.exception.SdkException;
+
abstract class AbstractCloudExternalFileWriter implements IExternalFileWriter {
private final IExternalFilePrinter printer;
private final ICloudClient cloudClient;
@@ -91,20 +95,34 @@
@Override
public final void write(IValueReference value) throws HyracksDataException
{
- printer.print(value);
+ try {
+ printer.print(value);
+ } catch (SdkException e) {
+ throw RuntimeDataException.create(ErrorCode.EXTERNAL_SOURCE_ERROR,
e, getMessageOrToString(e));
+ }
+
}
@Override
public final void abort() throws HyracksDataException {
- if (bufferedWriter != null) {
- bufferedWriter.abort();
+ try {
+ if (bufferedWriter != null) {
+ bufferedWriter.abort();
+ }
+ printer.close();
+ } catch (SdkException e) {
+ throw RuntimeDataException.create(ErrorCode.EXTERNAL_SOURCE_ERROR,
e, getMessageOrToString(e));
}
- printer.close();
}
@Override
public final void close() throws HyracksDataException {
- printer.close();
+ try {
+ printer.close();
+ } catch (SdkException e) {
+ throw RuntimeDataException.create(ErrorCode.EXTERNAL_SOURCE_ERROR,
e, getMessageOrToString(e));
+ }
+
}
abstract String getAdapterName();
diff --git
a/asterixdb/asterix-cloud/src/main/java/org/apache/asterix/cloud/writer/S3ExternalFileWriterFactory.java
b/asterixdb/asterix-cloud/src/main/java/org/apache/asterix/cloud/writer/S3ExternalFileWriterFactory.java
index 508225d..5036fc8 100644
---
a/asterixdb/asterix-cloud/src/main/java/org/apache/asterix/cloud/writer/S3ExternalFileWriterFactory.java
+++
b/asterixdb/asterix-cloud/src/main/java/org/apache/asterix/cloud/writer/S3ExternalFileWriterFactory.java
@@ -19,6 +19,7 @@
package org.apache.asterix.cloud.writer;
import static
org.apache.asterix.cloud.writer.AbstractCloudExternalFileWriter.isExceedingMaxLength;
+import static org.apache.hyracks.api.util.ExceptionUtils.getMessageOrToString;
import java.io.IOException;
import java.util.Collections;
@@ -51,6 +52,7 @@
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
+import software.amazon.awssdk.core.exception.SdkException;
import software.amazon.awssdk.services.s3.model.NoSuchBucketException;
public final class S3ExternalFileWriterFactory implements
IExternalFileWriterFactory {
@@ -126,12 +128,13 @@
doValidate(testClient, bucket);
} catch (IOException e) {
if (e.getCause() instanceof NoSuchBucketException) {
- throw new
CompilationException(ErrorCode.EXTERNAL_SOURCE_CONTAINER_NOT_FOUND, bucket);
+ throw
CompilationException.create(ErrorCode.EXTERNAL_SOURCE_CONTAINER_NOT_FOUND,
bucket);
} else {
- LOGGER.error(e);
throw
CompilationException.create(ErrorCode.EXTERNAL_SOURCE_ERROR,
ExceptionUtils.getMessageOrToString(e));
}
+ } catch (SdkException e) {
+ throw CompilationException.create(ErrorCode.EXTERNAL_SOURCE_ERROR,
e, getMessageOrToString(e));
}
}
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/17979
To unsubscribe, or for help writing mail filters, visit
https://asterix-gerrit.ics.uci.edu/settings
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Change-Id: I21d9d4c91bdee50b86ab1bf6b2b06f23cf376a29
Gerrit-Change-Number: 17979
Gerrit-PatchSet: 1
Gerrit-Owner: Wail Alkowaileet <[email protected]>
Gerrit-MessageType: newchange