You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@heron.apache.org by GitBox <gi...@apache.org> on 2018/06/04 15:42:45 UTC
[GitHub] ajorgensen closed pull request #2864: S3Uploader improvements
ajorgensen closed pull request #2864: S3Uploader improvements
URL: https://github.com/apache/incubator-heron/pull/2864
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/heron/uploaders/src/java/BUILD b/heron/uploaders/src/java/BUILD
index 109ce56d41..35074889cd 100644
--- a/heron/uploaders/src/java/BUILD
+++ b/heron/uploaders/src/java/BUILD
@@ -10,6 +10,7 @@ uploader_spi_files = [
s3_deps_files = \
uploader_spi_files + [
+ "@org_apache_commons_commons_lang3//jar",
"//third_party/java:aws-java-sdk",
"//third_party/java:guava",
]
@@ -25,43 +26,43 @@ dlog_deps_files = \
"@org_apache_distributedlog_core//jar",
"//heron/io/dlog/src/java:dlog-lib",
]
-
+
http_uploader_deps_files = \
uploader_spi_files + [
"@org_apache_httpcomponents_httpmime//jar",
"@org_apache_httpcomponents_http_client//jar",
"@org_apache_httpcomponents_http_core//jar",
"@org_apache_commons_commons_lang3//jar",
- "//third_party/java:guava"
+ "//third_party/java:guava",
]
java_library(
- name = 'null-uploader-java',
+ name = "null-uploader-java",
srcs = glob(["**/NullUploader.java"]),
deps = uploader_spi_files,
)
java_binary(
- name = 'null-uploader-unshaded',
+ name = "null-uploader-unshaded",
srcs = glob(["**/NullUploader.java"]),
deps = uploader_spi_files,
)
genrule(
- name = 'heron-null-uploader',
+ name = "heron-null-uploader",
srcs = [":null-uploader-unshaded_deploy.jar"],
outs = ["heron-null-uploader.jar"],
- cmd = "cp $< $@",
+ cmd = "cp $< $@",
)
java_library(
- name = 'localfs-uploader-java',
+ name = "localfs-uploader-java",
srcs = glob(["**/localfs/**/*.java"]),
deps = uploader_spi_files,
)
java_binary(
- name = 'localfs-uploader-unshaded',
+ name = "localfs-uploader-unshaded",
srcs = glob(["**/localfs/**/*.java"]),
deps = uploader_spi_files,
)
@@ -70,17 +71,17 @@ genrule(
name = "heron-localfs-uploader",
srcs = [":localfs-uploader-unshaded_deploy.jar"],
outs = ["heron-localfs-uploader.jar"],
- cmd = "cp $< $@",
+ cmd = "cp $< $@",
)
java_library(
- name = 'hdfs-uploader-java',
+ name = "hdfs-uploader-java",
srcs = glob(["**/hdfs/**/*.java"]),
deps = uploader_spi_files,
)
java_binary(
- name = 'hdfs-uploader-unshaded',
+ name = "hdfs-uploader-unshaded",
srcs = glob(["**/hdfs/**/*.java"]),
deps = uploader_spi_files,
)
@@ -89,17 +90,17 @@ genrule(
name = "heron-hdfs-uploader",
srcs = [":hdfs-uploader-unshaded_deploy.jar"],
outs = ["heron-hdfs-uploader.jar"],
- cmd = "cp $< $@",
+ cmd = "cp $< $@",
)
java_library(
- name = 'dlog-uploader-java',
+ name = "dlog-uploader-java",
srcs = glob(["**/dlog/**/*.java"]),
deps = dlog_deps_files,
)
java_binary(
- name = 'dlog-uploader-unshaded',
+ name = "dlog-uploader-unshaded",
srcs = glob(["**/dlog/**/*.java"]),
deps = dlog_deps_files,
)
@@ -108,77 +109,81 @@ genrule(
name = "heron-dlog-uploader",
srcs = [":dlog-uploader-unshaded_deploy.jar"],
outs = ["heron-dlog-uploader.jar"],
- cmd = "cp $< $@",
+ cmd = "cp $< $@",
)
java_library(
- name = 's3-uploader-java',
+ name = "s3-uploader-java",
srcs = glob(["**/s3/**/*.java"]),
deps = s3_deps_files,
)
java_binary(
- name = 's3-uploader-unshaded',
+ name = "s3-uploader-unshaded",
srcs = glob(["**/s3/**/*.java"]),
- deps = s3_deps_files)
+ deps = s3_deps_files,
+)
genrule(
name = "heron-s3-uploader",
srcs = [":s3-uploader-unshaded_deploy.jar"],
outs = ["heron-s3-uploader.jar"],
- cmd = "cp $< $@",
+ cmd = "cp $< $@",
)
java_library(
- name = 'scp-uploader-java',
+ name = "scp-uploader-java",
srcs = glob(["**/scp/**/*.java"]),
deps = uploader_spi_files,
)
java_binary(
- name = 'scp-uploader-unshaded',
+ name = "scp-uploader-unshaded",
srcs = glob(["**/scp/**/*.java"]),
- deps = uploader_spi_files)
+ deps = uploader_spi_files,
+)
genrule(
name = "heron-scp-uploader",
srcs = [":scp-uploader-unshaded_deploy.jar"],
outs = ["heron-scp-uploader.jar"],
- cmd = "cp $< $@",
+ cmd = "cp $< $@",
)
java_library(
- name = 'gcs-uploader-java',
+ name = "gcs-uploader-java",
srcs = glob(["**/gcs/**/*.java"]),
deps = gcs_deps_files,
)
java_binary(
- name = 'gcs-uploader-unshaded',
+ name = "gcs-uploader-unshaded",
srcs = glob(["**/gcs/**/*.java"]),
- deps = gcs_deps_files)
+ deps = gcs_deps_files,
+)
genrule(
name = "heron-gcs-uploader",
srcs = [":gcs-uploader-unshaded_deploy.jar"],
outs = ["heron-gcs-uploader.jar"],
- cmd = "cp $< $@",
+ cmd = "cp $< $@",
)
java_library(
- name = 'http-uploader-java',
+ name = "http-uploader-java",
srcs = glob(["**/http/**/*.java"]),
deps = http_uploader_deps_files,
)
java_binary(
- name = 'http-uploader-unshaded',
+ name = "http-uploader-unshaded",
srcs = glob(["**/http/**/*.java"]),
- deps = http_uploader_deps_files)
+ deps = http_uploader_deps_files,
+)
genrule(
name = "heron-http-uploader",
srcs = [":http-uploader-unshaded_deploy.jar"],
outs = ["heron-http-uploader.jar"],
- cmd = "cp $< $@",
+ cmd = "cp $< $@",
)
diff --git a/heron/uploaders/src/java/org/apache/heron/uploader/s3/S3Uploader.java b/heron/uploaders/src/java/org/apache/heron/uploader/s3/S3Uploader.java
index d21057c3ca..d638d6e03c 100644
--- a/heron/uploaders/src/java/org/apache/heron/uploader/s3/S3Uploader.java
+++ b/heron/uploaders/src/java/org/apache/heron/uploader/s3/S3Uploader.java
@@ -34,6 +34,7 @@
import com.amazonaws.services.s3.AmazonS3ClientBuilder;
import com.google.common.base.Strings;
+import org.apache.commons.lang3.StringUtils;
import org.apache.heron.spi.common.Config;
import org.apache.heron.spi.common.Context;
import org.apache.heron.spi.uploader.IUploader;
@@ -143,11 +144,14 @@ public void initialize(Config config) {
builder.setClientConfiguration(clientCfg);
}
- s3Client = builder.withRegion(customRegion)
- .withPathStyleAccessEnabled(true)
- .withChunkedEncodingDisabled(true)
- .withPayloadSigningEnabled(true)
- .build();
+ if(StringUtils.isNotBlank(customRegion)) {
+ builder.setRegion(customRegion);
+ }
+
+ s3Client = builder.withPathStyleAccessEnabled(true)
+ .withChunkedEncodingDisabled(true)
+ .withPayloadSigningEnabled(true)
+ .build();
if (!Strings.isNullOrEmpty(endpoint)) {
s3Client.setEndpoint(endpoint);
@@ -237,7 +241,8 @@ public boolean undo() {
public void close() {
// Cleanup the backup file if it exists as its not needed anymore.
// This will succeed whether the file exists or not.
- if (!Strings.isNullOrEmpty(previousVersionFilePath)) {
+ if (!Strings.isNullOrEmpty(previousVersionFilePath)
+ && s3Client.doesObjectExist(bucket, previousVersionFilePath)) {
s3Client.deleteObject(bucket, previousVersionFilePath);
}
}
diff --git a/heron/uploaders/tests/java/org/apache/heron/uploader/s3/S3UploaderTest.java b/heron/uploaders/tests/java/org/apache/heron/uploader/s3/S3UploaderTest.java
index 0154502ab6..85f42b34ff 100644
--- a/heron/uploaders/tests/java/org/apache/heron/uploader/s3/S3UploaderTest.java
+++ b/heron/uploaders/tests/java/org/apache/heron/uploader/s3/S3UploaderTest.java
@@ -173,10 +173,28 @@ public void cleanUpPreviousVersionOnClose() {
String expectedPreviousVersionPath = "test-topology/previous_topology.tar.gz";
String expectedBucket = "bucket";
+ when(mockS3Client.doesObjectExist(expectedBucket, expectedPreviousVersionPath))
+ .thenReturn(true);
+
uploader.close();
+
+ verify(mockS3Client).doesObjectExist(expectedBucket, expectedPreviousVersionPath);
verify(mockS3Client).deleteObject(expectedBucket, expectedPreviousVersionPath);
}
+ @Test
+ public void close_DoNotDeleteFileIfItDoesNotExist() {
+ String expectedPreviousVersionPath = "test-topology/previous_topology.tar.gz";
+ String expectedBucket = "bucket";
+
+ when(mockS3Client.doesObjectExist(expectedBucket, expectedPreviousVersionPath))
+ .thenReturn(false);
+
+ uploader.close();
+
+ verify(mockS3Client).doesObjectExist(expectedBucket, expectedPreviousVersionPath);
+ verify(mockS3Client, never()).deleteObject(expectedBucket, expectedPreviousVersionPath);
+ }
@Test
public void PrefixUploadPathWithSpecifiedPrefix() throws Exception {
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services