Apache
/
jclouds
mirror of https://github.com/apache/jclouds.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Reset xattr on overwrite in filesystem provider

This commit is contained in:
Andrew Gaul 2014-08-31 13:04:32 -07:00
parent 0b89b1fd10
commit a1049449f4
2 changed files with 34 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
apis/filesystem/src/main/java/org/jclouds/filesystem/strategy/internal/FilesystemStorageStrategyImpl.java
View File

@ -276,6 +276,7 @@ public class FilesystemStorageStrategyImpl implements LocalStorageStrategy {
try {
Files.createParentDirs(outputFile);
his = new HashingInputStream(Hashing.md5(), payload.openStream());
outputFile.delete();
Files.asByteSink(outputFile).writeFrom(his);
HashCode actualHashCode = his.hash();
HashCode expectedHashCode = payload.getContentMetadata().getContentMD5AsHashCode();

33
apis/filesystem/src/test/java/org/jclouds/filesystem/strategy/internal/FilesystemStorageStrategyImplTest.java
View File

@ -16,6 +16,8 @@
*/
package org.jclouds.filesystem.strategy.internal;
import static org.jclouds.utils.TestUtils.isMacOSX;
import static org.jclouds.utils.TestUtils.randomByteSource;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertFalse;
import static org.testng.Assert.assertNotNull;
@ -43,8 +45,10 @@ import org.jclouds.io.payloads.InputStreamPayload;
import org.jclouds.util.Throwables2;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
import org.testng.SkipException;
import org.testng.annotations.Test;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
import com.google.common.io.ByteSource;
@ -526,6 +530,35 @@ public class FilesystemStorageStrategyImplTest {
}
}
public void testOverwriteBlobMetadata() throws Exception {
if (isMacOSX()) {
throw new SkipException("blob metadata not supported on Mac OS X");
}
String blobKey = TestUtils.createRandomBlobKey("writePayload-", ".img");
// write blob
Blob blob = new BlobBuilderImpl()
.name(blobKey)
.payload(randomByteSource().slice(0, 1024))
.userMetadata(ImmutableMap.of("key1", "value1"))
.build();
storageStrategy.putBlob(CONTAINER_NAME, blob);
blob = storageStrategy.getBlob(CONTAINER_NAME, blobKey);
assertEquals(blob.getMetadata().getUserMetadata().get("key1"), "value1");
// overwrite blob
blob = new BlobBuilderImpl()
.name(blobKey)
.payload(randomByteSource().slice(0, 1024))
// no metadata
.build();
storageStrategy.putBlob(CONTAINER_NAME, blob);
blob = storageStrategy.getBlob(CONTAINER_NAME, blobKey);
assertFalse(blob.getMetadata().getUserMetadata().containsKey("key1"));
}
// ---------------------------------------------------------- Private methods
/**