You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by bh...@apache.org on 2019/03/10 05:49:06 UTC
[hadoop] branch ozone-0.4 updated: HDDS-1242. In S3 when bucket
already exists, it should just return location.
This is an automated email from the ASF dual-hosted git repository.
bharat pushed a commit to branch ozone-0.4
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/ozone-0.4 by this push:
new e65717a HDDS-1242. In S3 when bucket already exists, it should just return location.
e65717a is described below
commit e65717af25a2885bef47a6f2258079470b158cf8
Author: Bharat Viswanadham <bh...@apache.org>
AuthorDate: Sat Mar 9 21:42:17 2019 -0800
HDDS-1242. In S3 when bucket already exists, it should just return location.
(cherry picked from commit 73e1801b2db928d165e4cf076e1ba50ec1e8b48a)
---
.../dist/src/main/smoketest/s3/bucketcreate.robot | 34 ++++++++++++++++++++++
.../hadoop/ozone/s3/endpoint/EndpointBase.java | 2 +-
2 files changed, 35 insertions(+), 1 deletion(-)
diff --git a/hadoop-ozone/dist/src/main/smoketest/s3/bucketcreate.robot b/hadoop-ozone/dist/src/main/smoketest/s3/bucketcreate.robot
new file mode 100644
index 0000000..fe4217b
--- /dev/null
+++ b/hadoop-ozone/dist/src/main/smoketest/s3/bucketcreate.robot
@@ -0,0 +1,34 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+*** Settings ***
+Documentation S3 gateway test with aws cli
+Library OperatingSystem
+Library String
+Resource ../commonlib.robot
+Resource commonawslib.robot
+Test Setup Setup s3 tests
+
+*** Variables ***
+${ENDPOINT_URL} http://s3g:9878
+${BUCKET} generated
+
+*** Test Cases ***
+
+Create bucket which already exists
+ # Bucket already is created in Test Setup.
+ ${result} = Execute AWSS3APICli create-bucket --bucket ${BUCKET}
+ Should contain ${result} ${BUCKET}
+ Should contain ${result} Location
diff --git a/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/endpoint/EndpointBase.java b/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/endpoint/EndpointBase.java
index e111551..19329a4 100644
--- a/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/endpoint/EndpointBase.java
+++ b/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/endpoint/EndpointBase.java
@@ -113,7 +113,7 @@ public class EndpointBase {
try {
client.getObjectStore().createS3Bucket(userName, bucketName);
} catch (OMException ex) {
- if (ex.getResult() != ResultCodes.VOLUME_ALREADY_EXISTS) {
+ if (ex.getResult() != ResultCodes.S3_BUCKET_ALREADY_EXISTS) {
// S3 does not return error for bucket already exists, it just
// returns the location.
throw ex;
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org