big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

HDDS-821. Handle empty x-amz-storage-class header in Ozone S3 gateway. Contributed by Elek Marton.

Browse Source
This commit is contained in:
Bharat Viswanadham 2018-11-15 14:21:42 -08:00
parent 914b0cf15f
commit 57866b366f
2 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/endpoint/ObjectEndpoint.java
View File

@ -105,7 +105,7 @@ public Response put(
ReplicationType replicationType; ReplicationType replicationType;
ReplicationFactor replicationFactor; ReplicationFactor replicationFactor;
boolean storageTypeDefault; boolean storageTypeDefault;
if (storageType == null) { if (storageType == null || storageType.equals("")) {
replicationType = S3StorageType.getDefault().getType(); replicationType = S3StorageType.getDefault().getType();
replicationFactor = S3StorageType.getDefault().getFactor(); replicationFactor = S3StorageType.getDefault().getFactor();
storageTypeDefault = true; storageTypeDefault = true;

25
hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestPutObject.java → hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestObjectPut.java
View File

@ -26,8 +26,10 @@
import java.io.IOException; import java.io.IOException;
import java.nio.charset.Charset; import java.nio.charset.Charset;
import org.apache.hadoop.hdds.client.ReplicationType;
import org.apache.hadoop.ozone.client.ObjectStore; import org.apache.hadoop.ozone.client.ObjectStore;
import org.apache.hadoop.ozone.client.OzoneClientStub; import org.apache.hadoop.ozone.client.OzoneClientStub;
import org.apache.hadoop.ozone.client.OzoneKeyDetails;
import org.apache.hadoop.ozone.client.io.OzoneInputStream; import org.apache.hadoop.ozone.client.io.OzoneInputStream;
import org.apache.hadoop.ozone.s3.exception.OS3Exception; import org.apache.hadoop.ozone.s3.exception.OS3Exception;
@ -47,7 +49,7 @@
/** /**
* Test put object. * Test put object.
*/ */
public class TestPutObject { public class TestObjectPut {
public static final String CONTENT = "0123456789"; public static final String CONTENT = "0123456789";
private String userName = "ozone"; private String userName = "ozone";
private String bucketName = "b1"; private String bucketName = "b1";
@ -240,6 +242,27 @@ public void testInvalidStorageType() throws IOException {
ex.getErrorMessage()); ex.getErrorMessage());
assertEquals("random", ex.getResource()); assertEquals("random", ex.getResource());
} }
}
@Test
public void testEmptyStorageType() throws IOException, OS3Exception {
HttpHeaders headers = Mockito.mock(HttpHeaders.class);
ByteArrayInputStream body = new ByteArrayInputStream(CONTENT.getBytes());
objectEndpoint.setHeaders(headers);
keyName = "sourceKey";
when(headers.getHeaderString(STORAGE_CLASS_HEADER)).thenReturn("");
Response response =
objectEndpoint.put(bucketName, keyName, CONTENT.length(), body);
String volumeName = clientStub.getObjectStore()
.getOzoneVolumeName(bucketName);
OzoneKeyDetails key =
clientStub.getObjectStore().getVolume(volumeName).getBucket(bucketName)
.getKey(keyName);
//default type is set
Assert.assertEquals(ReplicationType.RATIS, key.getReplicationType());
} }
} }