You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by pt...@apache.org on 2015/12/21 20:31:22 UTC
[2/3] storm git commit: Merge branch 'master' into STORM-1399
Merge branch 'master' into STORM-1399
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/e2debcca
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/e2debcca
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/e2debcca
Branch: refs/heads/master
Commit: e2debccaca82f68602a9cfddddc7c9db6177e49d
Parents: 6470123 7f4aa5d
Author: P. Taylor Goetz <pt...@gmail.com>
Authored: Mon Dec 21 14:18:37 2015 -0500
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Mon Dec 21 14:18:37 2015 -0500
----------------------------------------------------------------------
CHANGELOG.md | 12 +
README.markdown | 11 +-
bin/storm.py | 2 +-
conf/defaults.yaml | 6 +
conf/user-resource-pools-example.yaml | 26 +
docs/documentation/Documentation.md | 2 +-
docs/documentation/Log-Search.md | 14 -
docs/documentation/Logs.md | 30 +
.../Resource_Aware_Scheduler_overview.md | 227 ++++
docs/documentation/Windowing.md | 91 ++
docs/documentation/distcache-blobstore.md | 735 +++++++++++
docs/documentation/images/hdfs_blobstore.png | Bin 0 -> 82180 bytes
docs/documentation/images/local_blobstore.png | Bin 0 -> 81212 bytes
.../images/nimbus_ha_blobstore.png | Bin 0 -> 113991 bytes
docs/documentation/nimbus-ha-design.md | 217 ----
...ware_scheduler_default_eviction_strategy.svg | 3 +
.../starter/ResourceAwareExampleTopology.java | 9 +-
.../storm/starter/SlidingTupleTsTopology.java | 62 +
.../storm/starter/SlidingWindowTopology.java | 81 +-
.../starter/bolt/SlidingWindowSumBolt.java | 80 ++
.../storm/starter/spout/RandomIntegerSpout.java | 55 +
log4j2/worker.xml | 8 +-
pom.xml | 10 +
.../src/clj/backtype/storm/LocalCluster.clj | 18 +-
storm-core/src/clj/backtype/storm/config.clj | 10 +-
.../src/clj/backtype/storm/daemon/executor.clj | 2 +
.../src/clj/backtype/storm/daemon/nimbus.clj | 44 +-
.../clj/backtype/storm/daemon/supervisor.clj | 25 +-
storm-core/src/clj/backtype/storm/testing.clj | 32 +-
storm-core/src/clj/backtype/storm/testing4j.clj | 18 +
storm-core/src/clj/backtype/storm/util.clj | 8 +-
storm-core/src/jvm/backtype/storm/Config.java | 98 +-
.../src/jvm/backtype/storm/ISubmitterHook.java | 31 +
.../src/jvm/backtype/storm/StormSubmitter.java | 44 +-
.../storm/blobstore/BlobSynchronizer.java | 2 +-
.../storm/blobstore/KeySequenceNumber.java | 2 +-
.../storm/blobstore/LocalFsBlobStore.java | 38 +-
.../backtype/storm/messaging/netty/Context.java | 4 +-
.../jvm/backtype/storm/scheduler/Cluster.java | 71 +
.../storm/scheduler/SupervisorDetails.java | 8 +-
.../backtype/storm/scheduler/Topologies.java | 14 +
.../storm/scheduler/TopologyDetails.java | 161 ++-
.../storm/scheduler/resource/RAS_Node.java | 253 ++--
.../storm/scheduler/resource/RAS_Nodes.java | 160 +++
.../resource/ResourceAwareScheduler.java | 421 ++++--
.../storm/scheduler/resource/ResourceUtils.java | 51 +
.../scheduler/resource/SchedulingResult.java | 116 ++
.../scheduler/resource/SchedulingStatus.java | 40 +
.../backtype/storm/scheduler/resource/User.java | 346 +++++
.../resource/strategies/IStrategy.java | 37 -
.../strategies/ResourceAwareStrategy.java | 479 -------
.../eviction/DefaultEvictionStrategy.java | 126 ++
.../strategies/eviction/IEvictionStrategy.java | 47 +
.../DefaultSchedulingPriorityStrategy.java | 81 ++
.../priority/ISchedulingPriorityStrategy.java | 41 +
.../DefaultResourceAwareStrategy.java | 488 +++++++
.../strategies/scheduling/IStrategy.java | 50 +
.../storm/topology/WindowedBoltExecutor.java | 110 +-
.../storm/topology/base/BaseWindowedBolt.java | 33 +
.../jvm/backtype/storm/utils/NimbusClient.java | 9 +-
.../utils/NimbusLeaderNotFoundException.java | 41 +
.../src/jvm/backtype/storm/utils/Utils.java | 28 +-
.../storm/validation/ConfigValidation.java | 60 +-
.../validation/ConfigValidationAnnotations.java | 9 +
.../storm/windowing/CountEvictionPolicy.java | 17 +-
.../storm/windowing/CountTriggerPolicy.java | 11 +-
.../src/jvm/backtype/storm/windowing/Event.java | 8 +
.../jvm/backtype/storm/windowing/EventImpl.java | 13 +
.../storm/windowing/EvictionPolicy.java | 38 +-
.../storm/windowing/TimeEvictionPolicy.java | 39 +-
.../storm/windowing/TimeTriggerPolicy.java | 13 +
.../storm/windowing/TriggerHandler.java | 6 +-
.../storm/windowing/WaterMarkEvent.java | 38 +
.../windowing/WaterMarkEventGenerator.java | 116 ++
.../windowing/WatermarkCountEvictionPolicy.java | 65 +
.../windowing/WatermarkCountTriggerPolicy.java | 83 ++
.../windowing/WatermarkTimeEvictionPolicy.java | 77 ++
.../windowing/WatermarkTimeTriggerPolicy.java | 109 ++
.../backtype/storm/windowing/WindowManager.java | 153 ++-
.../planner/processor/StateQueryProcessor.java | 5 +-
.../test/clj/backtype/storm/nimbus_test.clj | 5 +-
.../scheduler/resource_aware_scheduler_test.clj | 193 ++-
.../storm/security/auth/ThriftClient_test.clj | 31 +-
.../backtype/storm/security/auth/auth_test.clj | 4 +-
.../storm/security/auth/drpc_auth_test.clj | 2 -
.../storm/security/auth/nimbus_auth_test.clj | 3 +-
.../jvm/backtype/storm/TestConfigValidate.java | 84 ++
.../backtype/storm/localizer/LocalizerTest.java | 4 +-
.../resource/TestResourceAwareScheduler.java | 1227 ++++++++++++++++++
.../storm/scheduler/resource/TestUser.java | 111 ++
.../TestUtilsForResourceAwareScheduler.java | 288 ++++
.../topology/WindowedBoltExecutorTest.java | 142 ++
.../windowing/WaterMarkEventGeneratorTest.java | 117 ++
.../storm/windowing/WindowManagerTest.java | 280 +++-
storm-multilang/javascript/pom.xml | 10 -
storm-multilang/python/pom.xml | 10 -
storm-multilang/ruby/pom.xml | 10 -
97 files changed, 7204 insertions(+), 1445 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/e2debcca/storm-core/test/jvm/backtype/storm/localizer/LocalizerTest.java
----------------------------------------------------------------------
diff --cc storm-core/test/jvm/backtype/storm/localizer/LocalizerTest.java
index 6cc75aa,7650d80..2b84f23
--- a/storm-core/test/jvm/backtype/storm/localizer/LocalizerTest.java
+++ b/storm-core/test/jvm/backtype/storm/localizer/LocalizerTest.java
@@@ -518,11 -518,9 +518,9 @@@ public class LocalizerTest
@Test(expected = KeyNotFoundException.class)
public void testKeyNotFoundException() throws Exception {
- Map conf = new HashMap();
+ Map conf = Utils.readStormConfig();
String key1 = "key1";
- conf.put(Config.STORM_LOCAL_DIR, "local");
+ conf.put(Config.STORM_LOCAL_DIR, "target");
- conf.put(Config.BLOBSTORE_SUPERUSER, "superuser");
- conf.put(Config.STORM_PRINCIPAL_TO_LOCAL_PLUGIN, "backtype.storm.security.auth.DefaultPrincipalToLocal");
LocalFsBlobStore bs = new LocalFsBlobStore();
LocalFsBlobStore spy = spy(bs);
Mockito.doReturn(true).when(spy).checkForBlobOrDownload(key1);