Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Store the MPU ETag for the transient blobstore #118

Merged
merged 1 commit into from
Aug 5, 2021
Merged

Store the MPU ETag for the transient blobstore #118

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions blobstore/src/main/java/org/jclouds/blobstore/TransientStorageStrategy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,14 @@ public String putBlob(final String containerName, final Blob blob, BlobAccess ac
Closeables2.closeQuietly(input);
}

Blob newBlob = createUpdatedCopyOfBlobInContainer(containerName, blob, payload, actualHashCode);
String eTag = null;
if (blob.getMetadata() != null) {
eTag = blob.getMetadata().getETag();
}
if (eTag == null) {
eTag = base16().lowerCase().encode(actualHashCode.asBytes());
}
Blob newBlob = createUpdatedCopyOfBlobInContainer(containerName, blob, payload, actualHashCode, eTag);
Map<String, Blob> map = containerToBlobs.get(containerName);
String blobName = newBlob.getMetadata().getName();
map.put(blobName, newBlob);
Expand Down Expand Up @@ -240,11 +247,12 @@ public String getSeparator() {
return "/";
}

private Blob createUpdatedCopyOfBlobInContainer(String containerName, Blob in, byte[] input, HashCode contentMd5) {
private Blob createUpdatedCopyOfBlobInContainer(String containerName, Blob in, byte[] input, HashCode contentMd5, String eTag) {
checkNotNull(containerName, "containerName");
checkNotNull(in, "blob");
checkNotNull(input, "input");
checkNotNull(contentMd5, "contentMd5");
checkNotNull(eTag, "eTag");
Payload payload = createPayload(input);
MutableContentMetadata oldMd = in.getPayload().getContentMetadata();
HttpUtils.copy(oldMd, payload.getContentMetadata());
Expand All @@ -255,7 +263,6 @@ private Blob createUpdatedCopyOfBlobInContainer(String containerName, Blob in, b
blob.getMetadata().setContainer(containerName);
blob.getMetadata().setLastModified(new Date());
blob.getMetadata().setSize((long) input.length);
String eTag = base16().lowerCase().encode(contentMd5.asBytes());
blob.getMetadata().setETag(eTag);
// Set HTTP headers to match metadata
blob.getAllHeaders().replaceValues(HttpHeaders.LAST_MODIFIED,
Expand Down
25 changes: 25 additions & 0 deletions blobstore/src/test/java/org/jclouds/blobstore/integration/TransientBlobIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,19 @@
*/
package org.jclouds.blobstore.integration;

import com.google.common.hash.Hasher;
import com.google.common.hash.Hashing;
import com.google.common.io.BaseEncoding;
import org.jclouds.blobstore.domain.Blob;
import org.jclouds.blobstore.domain.MultipartPart;
import org.jclouds.blobstore.integration.internal.BaseBlobIntegrationTest;
import org.testng.annotations.Test;
import org.testng.SkipException;

import java.util.List;

import static org.assertj.core.api.Assertions.assertThat;

@Test(groups = { "integration" })
public class TransientBlobIntegrationTest extends BaseBlobIntegrationTest {
public TransientBlobIntegrationTest() {
Expand All @@ -31,4 +40,20 @@ public TransientBlobIntegrationTest() {
public void testSetBlobAccess() throws Exception {
throw new SkipException("transient does not support anonymous access");
}

@Override
protected void checkMPUParts(Blob blob, List<MultipartPart> parts) {
assertThat(blob.getMetadata().getETag()).endsWith(String.format("-%d\"", parts.size()));
Hasher eTagHasher = Hashing.md5().newHasher();
for (MultipartPart part : parts) {
eTagHasher.putBytes(BaseEncoding.base16().lowerCase().decode(part.partETag()));
}
String expectedETag = new StringBuilder("\"")
.append(eTagHasher.hash())
.append("-")
.append(parts.size())
.append("\"")
.toString();
assertThat(blob.getMetadata().getETag()).isEqualTo(expectedETag);
}
}