You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by ki...@apache.org on 2016/03/04 19:13:42 UTC
[4/6] storm git commit: Merge branch 'master' of
github.com:apache/storm into storm1529
Merge branch 'master' of github.com:apache/storm into storm1529
Conflicts:
storm-core/test/clj/org/apache/storm/supervisor_test.clj
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/761296a1
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/761296a1
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/761296a1
Branch: refs/heads/master
Commit: 761296a1aba34e173c96314a31a9099aa4af3693
Parents: eddfea3 db04ce6
Author: Kishor Patil <kp...@yahoo-inc.com>
Authored: Fri Mar 4 17:22:29 2016 +0000
Committer: Kishor Patil <kp...@yahoo-inc.com>
Committed: Fri Mar 4 17:22:29 2016 +0000
----------------------------------------------------------------------
.gitignore | 1 +
CHANGELOG.md | 34 +-
README.markdown | 7 +-
bin/flight.bash | 4 +-
bin/storm.cmd | 4 +-
bin/storm.py | 10 +-
conf/defaults.yaml | 4 +-
.../storm/starter/ThroughputVsLatency.java | 2 +-
.../apache/storm/sql/compiler/CompilerUtil.java | 7 +-
.../apache/storm/sql/compiler/ExprCompiler.java | 32 +-
.../backends/standalone/RelNodeCompiler.java | 6 +-
.../apache/storm/sql/parser/StormParser.java | 5 +
.../test/org/apache/storm/sql/TestStormSql.java | 64 +-
.../storm/sql/compiler/TestCompilerUtils.java | 62 +-
.../storm/sql/compiler/TestExprSemantic.java | 18 +
.../backends/standalone/TestPlanCompiler.java | 20 +
.../backends/trident/TestPlanCompiler.java | 4 +-
.../test/org/apache/storm/sql/TestUtils.java | 32 +-
.../storm/hdfs/bolt/AbstractHdfsBolt.java | 10 +-
.../storm/hdfs/bolt/AvroGenericRecordBolt.java | 8 +-
.../org/apache/storm/hdfs/bolt/HdfsBolt.java | 8 +-
.../storm/hdfs/bolt/SequenceFileBolt.java | 8 +-
.../org/apache/storm/kafka/IntSerializer.java | 10 +-
.../apache/storm/kafka/PartitionManager.java | 5 +-
.../kafka/trident/TridentKafkaEmitter.java | 5 +-
pom.xml | 23 +
.../src/clj/org/apache/storm/thrift.clj | 2 +-
.../src/clj/org/apache/storm/MockAutoCred.clj | 58 --
storm-core/src/clj/org/apache/storm/cluster.clj | 700 -------------------
.../cluster_state/zookeeper_state_factory.clj | 165 -----
.../clj/org/apache/storm/command/heartbeats.clj | 6 +-
.../clj/org/apache/storm/command/monitor.clj | 37 -
.../clj/org/apache/storm/command/rebalance.clj | 47 --
.../org/apache/storm/command/set_log_level.clj | 76 --
.../apache/storm/command/shell_submission.clj | 2 +-
.../apache/storm/command/upload_credentials.clj | 35 -
.../src/clj/org/apache/storm/converter.clj | 23 +-
.../src/clj/org/apache/storm/daemon/acker.clj | 108 ---
.../src/clj/org/apache/storm/daemon/common.clj | 29 +-
.../src/clj/org/apache/storm/daemon/drpc.clj | 38 +-
.../clj/org/apache/storm/daemon/executor.clj | 13 +-
.../clj/org/apache/storm/daemon/logviewer.clj | 65 +-
.../src/clj/org/apache/storm/daemon/nimbus.clj | 165 +++--
.../clj/org/apache/storm/daemon/supervisor.clj | 57 +-
.../src/clj/org/apache/storm/daemon/worker.clj | 68 +-
.../clj/org/apache/storm/internal/thrift.clj | 2 +-
.../storm/pacemaker/pacemaker_state_factory.clj | 141 ----
.../clj/org/apache/storm/process_simulator.clj | 49 --
storm-core/src/clj/org/apache/storm/stats.clj | 3 +-
storm-core/src/clj/org/apache/storm/testing.clj | 28 +-
storm-core/src/clj/org/apache/storm/ui/core.clj | 132 ++--
.../src/clj/org/apache/storm/ui/helpers.clj | 199 +-----
storm-core/src/clj/org/apache/storm/util.clj | 11 +
.../src/clj/org/apache/storm/zookeeper.clj | 74 --
storm-core/src/jvm/org/apache/storm/Config.java | 9 +
.../jvm/org/apache/storm/ProcessSimulator.java | 82 +++
.../storm/blobstore/LocalFsBlobStore.java | 2 +-
.../jvm/org/apache/storm/callback/Callback.java | 23 -
.../storm/callback/ZKStateChangedCallback.java | 25 +
.../org/apache/storm/cluster/ClusterState.java | 217 ------
.../storm/cluster/ClusterStateContext.java | 2 +-
.../storm/cluster/ClusterStateFactory.java | 28 -
.../org/apache/storm/cluster/ClusterUtils.java | 244 +++++++
.../org/apache/storm/cluster/ExecutorBeat.java | 44 ++
.../org/apache/storm/cluster/IStateStorage.java | 222 ++++++
.../storm/cluster/IStormClusterState.java | 124 ++++
.../storm/cluster/PaceMakerStateStorage.java | 216 ++++++
.../cluster/PaceMakerStateStorageFactory.java | 64 ++
.../storm/cluster/StateStorageFactory.java | 28 +
.../storm/cluster/StormClusterStateImpl.java | 697 ++++++++++++++++++
.../apache/storm/cluster/ZKStateStorage.java | 244 +++++++
.../storm/cluster/ZKStateStorageFactory.java | 36 +
.../src/jvm/org/apache/storm/command/CLI.java | 34 +-
.../src/jvm/org/apache/storm/command/List.java | 50 --
.../apache/storm/command/ListTopologies.java | 52 ++
.../jvm/org/apache/storm/command/Monitor.java | 65 ++
.../jvm/org/apache/storm/command/Rebalance.java | 86 +++
.../org/apache/storm/command/SetLogLevel.java | 116 +++
.../apache/storm/command/UploadCredentials.java | 61 ++
.../src/jvm/org/apache/storm/daemon/Acker.java | 128 ++++
.../storm/daemon/metrics/MetricsUtils.java | 2 +-
.../storm/metric/FileBasedEventLogger.java | 18 +-
.../apache/storm/pacemaker/PacemakerClient.java | 6 +-
.../apache/storm/security/auth/AuthUtils.java | 40 ++
.../security/auth/ThriftConnectionType.java | 2 +-
.../storm/security/auth/kerberos/AutoTGT.java | 64 +-
.../auth/kerberos/AutoTGTKrb5LoginModule.java | 8 +-
.../serialization/SerializationFactory.java | 2 +
.../testing/staticmocking/MockedCluster.java | 31 +
.../MockedPaceMakerStateStorageFactory.java | 32 +
.../apache/storm/topology/TopologyBuilder.java | 13 +-
.../apache/storm/trident/tuple/ConsList.java | 20 +-
.../apache/storm/ui/FilterConfiguration.java | 63 ++
.../jvm/org/apache/storm/ui/IConfigurator.java | 24 +
.../src/jvm/org/apache/storm/ui/UIHelpers.java | 267 +++++++
.../jvm/org/apache/storm/utils/ConfigUtils.java | 8 +-
.../src/jvm/org/apache/storm/utils/Time.java | 1 +
.../src/jvm/org/apache/storm/utils/Utils.java | 91 ++-
.../storm/utils/WorkerBackpressureCallback.java | 2 +-
.../storm/utils/WorkerBackpressureThread.java | 38 +-
.../org/apache/storm/zookeeper/Zookeeper.java | 77 +-
storm-core/src/ui/public/component.html | 2 +-
.../templates/topology-page-template.html | 6 +-
storm-core/src/ui/public/topology.html | 2 +-
.../org/apache/storm/integration_test.clj | 13 +-
.../test/clj/org/apache/storm/cluster_test.clj | 202 +++---
.../storm/messaging/netty_integration_test.clj | 1 +
.../test/clj/org/apache/storm/nimbus_test.clj | 166 ++---
.../storm/pacemaker_state_factory_test.clj | 121 ++--
.../security/auth/auto_login_module_test.clj | 24 +-
.../storm/security/auth/nimbus_auth_test.clj | 3 +-
.../clj/org/apache/storm/supervisor_test.clj | 173 ++---
.../test/clj/org/apache/storm/utils_test.clj | 111 ---
.../test/jvm/org/apache/storm/MockAutoCred.java | 75 ++
.../org/apache/storm/command/RebalanceTest.java | 41 ++
.../apache/storm/command/SetLogLevelTest.java | 54 ++
.../jvm/org/apache/storm/command/TestCLI.java | 44 +-
.../storm/topology/TopologyBuilderTest.java | 65 ++
.../jvm/org/apache/storm/utils/TimeTest.java | 112 +++
.../jvm/org/apache/storm/utils/UtilsTest.java | 219 ++++++
.../utils/WorkerBackpressureThreadTest.java | 50 ++
.../storm/utils/staticmocking/package-info.java | 2 +-
122 files changed, 4931 insertions(+), 2989 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/761296a1/storm-core/src/clj/org/apache/storm/daemon/supervisor.clj
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/761296a1/storm-core/src/jvm/org/apache/storm/utils/ConfigUtils.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/761296a1/storm-core/test/clj/org/apache/storm/supervisor_test.clj
----------------------------------------------------------------------
diff --cc storm-core/test/clj/org/apache/storm/supervisor_test.clj
index eb02e50,415a56d..42dd766
--- a/storm-core/test/clj/org/apache/storm/supervisor_test.clj
+++ b/storm-core/test/clj/org/apache/storm/supervisor_test.clj
@@@ -321,8 -322,7 +322,8 @@@
"-Dworkers.artifacts=/tmp/workers-artifacts"
"-Dstorm.conf.file="
"-Dstorm.options="
- (str "-Dstorm.log.dir=" Utils/FILE_PATH_SEPARATOR "logs")
+ (str "-Dstorm.log.dir=" storm-log-dir)
+ (str "-Djava.io.tmpdir=/tmp/workers" Utils/FILE_PATH_SEPARATOR mock-worker-id Utils/FILE_PATH_SEPARATOR "tmp")
(str "-Dlogging.sensitivity=" mock-sensitivity)
(str "-Dlog4j.configurationFile=" Utils/FILE_PATH_SEPARATOR "log4j2" Utils/FILE_PATH_SEPARATOR "worker.xml")
"-DLog4jContextSelector=org.apache.logging.log4j.core.selector.BasicContextSelector"
@@@ -517,8 -514,7 +519,8 @@@
" '-Dworkers.artifacts=" (str storm-local "/workers-artifacts'")
" '-Dstorm.conf.file='"
" '-Dstorm.options='"
- " '-Dstorm.log.dir=/logs'"
+ " '-Dstorm.log.dir=" storm-log-dir "'"
+ " '-Djava.io.tmpdir=" (str storm-local "/workers/" mock-worker-id "/tmp'")
" '-Dlogging.sensitivity=" mock-sensitivity "'"
" '-Dlog4j.configurationFile=/log4j2/worker.xml'"
" '-DLog4jContextSelector=org.apache.logging.log4j.core.selector.BasicContextSelector'"