Apache/jclouds
1
0
Fork 0
mirror of https://github.com/apache/jclouds.git synced 2025-02-06 01:59:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Do not compare MPU ETag contents

Browse Source 
AWS S3 MPU ETag are hashes of the part ETag headers but some
implementations, specifically S3Proxy with the filesystem provider,
represent multi-part objects as a single object.  Remove these checks
since they add nothing.
This commit is contained in:
Andrew Gaul 2016-01-12 15:36:37 -08:00
parent a90245afe5
commit c20fcb8cda
1 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
apis/s3/src/test/java/org/jclouds/s3/S3ClientLiveTest.java
View File

@ -531,19 +531,10 @@ public class S3ClientLiveTest extends BaseBlobStoreIntegrationTest {
} }
assertThat(getApi().listMultipartParts(containerName, key, uploadId)).containsOnlyKeys(1); assertThat(getApi().listMultipartParts(containerName, key, uploadId)).containsOnlyKeys(1);
String eTag = getApi().completeMultipartUpload(containerName, key, uploadId, ImmutableMap.of(1, eTagOf1)); getApi().completeMultipartUpload(containerName, key, uploadId, ImmutableMap.of(1, eTagOf1));
assert !eTagOf1.equals(eTag);
object = getApi().getObject(containerName, key); object = getApi().getObject(containerName, key);
assertEquals(ByteStreams2.toByteArrayAndClose(object.getPayload().openStream()), buffer); assertEquals(ByteStreams2.toByteArrayAndClose(object.getPayload().openStream()), buffer);
// noticing amazon does not return content-md5 header or a parsable ETag after a multi-part
// upload is complete:
// https://forums.aws.amazon.com/thread.jspa?threadID=61344
assertEquals(object.getPayload().getContentMetadata().getContentMD5(), null);
assertEquals(getApi().headObject(containerName, key).getContentMetadata().getContentMD5(), null);
} finally { } finally {
if (object != null) if (object != null)
object.getPayload().close(); object.getPayload().close();
@ -566,8 +557,7 @@ public class S3ClientLiveTest extends BaseBlobStoreIntegrationTest {
String eTagOf1 = getApi().uploadPartCopy(containerName, toObject, 1, uploadId, containerName, fromObject, 1, oneHundredOneConstitutions.size() - 1); String eTagOf1 = getApi().uploadPartCopy(containerName, toObject, 1, uploadId, containerName, fromObject, 1, oneHundredOneConstitutions.size() - 1);
String eTag = getApi().completeMultipartUpload(containerName, toObject, uploadId, ImmutableMap.of(1, eTagOf1)); getApi().completeMultipartUpload(containerName, toObject, uploadId, ImmutableMap.of(1, eTagOf1));
assertThat(eTag).isNotEqualTo(eTagOf1);
object = getApi().getObject(containerName, toObject); object = getApi().getObject(containerName, toObject);
assertEquals(ByteStreams2.toByteArrayAndClose(object.getPayload().openStream()), oneHundredOneConstitutions.slice(1, oneHundredOneConstitutions.size() - 1).read()); assertEquals(ByteStreams2.toByteArrayAndClose(object.getPayload().openStream()), oneHundredOneConstitutions.slice(1, oneHundredOneConstitutions.size() - 1).read());