You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by bo...@apache.org on 2018/05/04 18:43:19 UTC
[6/6] storm git commit: Merge branch 'STORM-2171-I' of
https://github.com/govind-menon/storm into STORM-2171
Merge branch 'STORM-2171-I' of https://github.com/govind-menon/storm into STORM-2171
STORM-2171: Removing LocalFsBlobStore specific Nimbus actions
This closes #2658
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/02639f4f
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/02639f4f
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/02639f4f
Branch: refs/heads/master
Commit: 02639f4f07140fdc3248a9ef869d62654d378d24
Parents: 844b2d2 de12958
Author: Robert Evans <ev...@yahoo-inc.com>
Authored: Fri May 4 11:11:24 2018 -0500
Committer: Robert Evans <ev...@yahoo-inc.com>
Committed: Fri May 4 11:11:24 2018 -0500
----------------------------------------------------------------------
.../org/apache/storm/blobstore/ListHDFS.java | 2 +-
.../org/apache/storm/blobstore/ListLocalFs.java | 2 +-
.../apache/storm/blobstore/MigrateBlobs.java | 4 +-
.../storm/hdfs/blobstore/HdfsBlobStore.java | 13 +-
.../hdfs/blobstore/HdfsClientBlobStore.java | 2 +-
.../org/apache/storm/blobstore/BlobStore.java | 18 +-
.../storm/cluster/IStormClusterState.java | 2 +-
.../storm/cluster/StormClusterStateImpl.java | 2 +-
.../org/apache/storm/nimbus/ILeaderElector.java | 68 +++
.../org/apache/storm/command/AdminCommands.java | 24 +-
.../test/clj/org/apache/storm/cluster_test.clj | 4 +-
.../storm/blobstore/BlobSynchronizer.java | 126 -----
.../storm/blobstore/LocalFsBlobStore.java | 147 +++++-
.../blobstore/LocalFsBlobStoreSynchronizer.java | 138 ++++++
.../org/apache/storm/daemon/nimbus/Nimbus.java | 185 ++-----
.../org/apache/storm/nimbus/ILeaderElector.java | 68 ---
.../org/apache/storm/utils/ServerUtils.java | 16 +-
.../apache/storm/zookeeper/AclEnforcement.java | 2 +-
.../apache/storm/blobstore/BlobStoreTest.java | 467 ------------------
.../storm/blobstore/BlobSynchronizerTest.java | 136 ------
.../LocalFsBlobStoreSynchronizerTest.java | 136 ++++++
.../storm/blobstore/LocalFsBlobStoreTest.java | 482 +++++++++++++++++++
.../storm/localizer/AsyncLocalizerTest.java | 2 +-
23 files changed, 1064 insertions(+), 982 deletions(-)
----------------------------------------------------------------------