You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by ka...@apache.org on 2017/07/07 04:50:01 UTC
[1/3] storm git commit: STORM-2478: Fix
BlobStoreTest.testDeleteAfterFailedCreate on Windows
Repository: storm
Updated Branches:
refs/heads/1.1.x-branch cf70c0e20 -> e151d6df6
STORM-2478: Fix BlobStoreTest.testDeleteAfterFailedCreate on Windows
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/cdf2b801
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/cdf2b801
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/cdf2b801
Branch: refs/heads/1.1.x-branch
Commit: cdf2b80146ae3028620e99ef70b146b6cfe58267
Parents: cf70c0e
Author: Stig Rohde Døssing <sd...@it-minds.dk>
Authored: Sun Apr 16 18:02:07 2017 +0200
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Fri Jul 7 13:49:16 2017 +0900
----------------------------------------------------------------------
.../org/apache/storm/blobstore/FileBlobStoreImpl.java | 6 ++++--
.../org/apache/storm/blobstore/LocalFsBlobStore.java | 7 +++++++
.../jvm/org/apache/storm/blobstore/BlobStoreTest.java | 14 ++++++++++----
3 files changed, 21 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/cdf2b801/storm-core/src/jvm/org/apache/storm/blobstore/FileBlobStoreImpl.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/org/apache/storm/blobstore/FileBlobStoreImpl.java b/storm-core/src/jvm/org/apache/storm/blobstore/FileBlobStoreImpl.java
index 6c6877f..a866505 100644
--- a/storm-core/src/jvm/org/apache/storm/blobstore/FileBlobStoreImpl.java
+++ b/storm-core/src/jvm/org/apache/storm/blobstore/FileBlobStoreImpl.java
@@ -17,6 +17,7 @@
*/
package org.apache.storm.blobstore;
+import com.google.common.annotations.VisibleForTesting;
import java.io.File;
import java.io.FileNotFoundException;
import java.io.IOException;
@@ -182,7 +183,8 @@ public class FileBlobStoreImpl {
delete(keyDir);
}
- private File getKeyDir(String key) {
+ @VisibleForTesting
+ File getKeyDir(String key) {
String hash = String.valueOf(Math.abs((long)key.hashCode()) % BUCKETS);
File ret = new File(new File(fullPath, hash), key);
LOG.debug("{} Looking for {} in {}", new Object[]{fullPath, key, hash});
@@ -240,7 +242,7 @@ public class FileBlobStoreImpl {
}
protected void delete(File path) throws IOException {
- if (Files.exists(path.toPath())){
+ if (Files.exists(path.toPath())) {
Files.walkFileTree(path.toPath(), new SimpleFileVisitor<Path>() {
http://git-wip-us.apache.org/repos/asf/storm/blob/cdf2b801/storm-core/src/jvm/org/apache/storm/blobstore/LocalFsBlobStore.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/org/apache/storm/blobstore/LocalFsBlobStore.java b/storm-core/src/jvm/org/apache/storm/blobstore/LocalFsBlobStore.java
index ca75c75..50c455c 100644
--- a/storm-core/src/jvm/org/apache/storm/blobstore/LocalFsBlobStore.java
+++ b/storm-core/src/jvm/org/apache/storm/blobstore/LocalFsBlobStore.java
@@ -46,6 +46,8 @@ import static org.apache.storm.blobstore.BlobStoreAclHandler.ADMIN;
import static org.apache.storm.blobstore.BlobStoreAclHandler.READ;
import static org.apache.storm.blobstore.BlobStoreAclHandler.WRITE;
+import com.google.common.annotations.VisibleForTesting;
+
/**
* Provides a local file system backed blob store implementation for Nimbus.
*
@@ -341,4 +343,9 @@ public class LocalFsBlobStore extends BlobStore {
public void fullCleanup(long age) throws IOException {
fbs.fullCleanup(age);
}
+
+ @VisibleForTesting
+ File getKeyDataDir(String key) {
+ return fbs.getKeyDir(DATA_PREFIX + key);
+ }
}
http://git-wip-us.apache.org/repos/asf/storm/blob/cdf2b801/storm-core/test/jvm/org/apache/storm/blobstore/BlobStoreTest.java
----------------------------------------------------------------------
diff --git a/storm-core/test/jvm/org/apache/storm/blobstore/BlobStoreTest.java b/storm-core/test/jvm/org/apache/storm/blobstore/BlobStoreTest.java
index 1d68326..fcff7c4 100644
--- a/storm-core/test/jvm/org/apache/storm/blobstore/BlobStoreTest.java
+++ b/storm-core/test/jvm/org/apache/storm/blobstore/BlobStoreTest.java
@@ -52,6 +52,8 @@ import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import static org.mockito.Mockito.spy;
+import java.nio.file.Files;
+
public class BlobStoreTest {
private static final Logger LOG = LoggerFactory.getLogger(BlobStoreTest.class);
URI base;
@@ -169,14 +171,18 @@ public class BlobStoreTest {
@Test
public void testDeleteAfterFailedCreate() throws Exception{
+ //Check that a blob can be deleted when a temporary file exists in the blob directory
LocalFsBlobStore store = initLocalFs();
+ String key = "test";
SettableBlobMeta metadata = new SettableBlobMeta(BlobStoreAclHandler
.WORLD_EVERYTHING);
- AtomicOutputStream out = store.createBlob("test", metadata, null);
- out.write(1);
-
-
+ try(AtomicOutputStream out = store.createBlob(key, metadata, null)) {
+ out.write(1);
+ File blobDir = store.getKeyDataDir(key);
+ Files.createFile(blobDir.toPath().resolve("tempFile.tmp"));
+ }
+
store.deleteBlob("test",null);
}
[3/3] storm git commit: STORM-2478: CHANGELOG
Posted by ka...@apache.org.
STORM-2478: CHANGELOG
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/e151d6df
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/e151d6df
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/e151d6df
Branch: refs/heads/1.1.x-branch
Commit: e151d6df6f163d3ad7bc7f43db182cd0e9497f94
Parents: 69539d2
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Fri Jul 7 13:49:41 2017 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Fri Jul 7 13:49:41 2017 +0900
----------------------------------------------------------------------
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/e151d6df/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 797d2ed..e0beaf9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
## 1.1.1
+ * STORM-2478: Fix BlobStoreTest.testDeleteAfterFailedCreate on Windows
* STORM-2602: storm.zookeeper.topology.auth.payload doesn't work even you set it
* STORM-2597: Don't parse passed in class paths
* STORM-2564: We should provide a template for storm-cluster-auth.yaml
[2/3] storm git commit: Merge branch 'STORM-2478-1.1.x-merge' into
1.1.x-branch
Posted by ka...@apache.org.
Merge branch 'STORM-2478-1.1.x-merge' into 1.1.x-branch
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/69539d26
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/69539d26
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/69539d26
Branch: refs/heads/1.1.x-branch
Commit: 69539d2694d091a1c81d67bb2aedfd7c020f62fe
Parents: cf70c0e cdf2b80
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Fri Jul 7 13:49:28 2017 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Fri Jul 7 13:49:28 2017 +0900
----------------------------------------------------------------------
.../org/apache/storm/blobstore/FileBlobStoreImpl.java | 6 ++++--
.../org/apache/storm/blobstore/LocalFsBlobStore.java | 7 +++++++
.../jvm/org/apache/storm/blobstore/BlobStoreTest.java | 14 ++++++++++----
3 files changed, 21 insertions(+), 6 deletions(-)
----------------------------------------------------------------------