You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by kn...@apache.org on 2015/11/24 21:55:34 UTC
[1/4] storm git commit: Added STORM-1189 to Changelog
Repository: storm
Updated Branches:
refs/heads/master f8a2d65a6 -> e2d267ff9
Added STORM-1189 to Changelog
Adding setting to travis.
Add caching to speed up build.
Kicking Travis
Testing travis matrix.
Testing
Testing
Testing
Testing
Testing
Testing
Testing
Testing
Fixing .travis.yml
Cleanup
Testing split-up travis.
Fixing newline in travis.yml
Switching up the modules.
Switching up the modules.
Switching up the modules.
Revert whitespace.
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/bb266fb5
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/bb266fb5
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/bb266fb5
Branch: refs/heads/master
Commit: bb266fb5f843a2791d9227df71563a958eafc256
Parents: 57a3b89
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Tue Nov 10 08:34:56 2015 -0600
Committer: Kyle Nusbaum <Ky...@gmail.com>
Committed: Mon Nov 23 16:33:14 2015 -0600
----------------------------------------------------------------------
.travis.yml | 13 ++++++++++++-
CHANGELOG.md | 1 +
dev-tools/travis/travis-script.sh | 2 +-
3 files changed, 14 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/bb266fb5/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index a7e2df4..05e24fe 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,6 +9,11 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
+
+env:
+ - MODULES=storm-core
+ - MODULES='!storm-core'
+
language: java
jdk:
- oraclejdk7
@@ -18,4 +23,10 @@ before_install:
- nvm install 0.12.2
- nvm use 0.12.2
install: /bin/bash ./dev-tools/travis/travis-install.sh `pwd`
-script: /bin/bash ./dev-tools/travis/travis-script.sh `pwd`
+script: /bin/bash ./dev-tools/travis/travis-script.sh `pwd` $MODULES
+sudo: false
+cache:
+ directories:
+ - "$HOME/.m2/repository"
+ - "$HOME/.rvm"
+ - "$NVM_DIR"
http://git-wip-us.apache.org/repos/asf/storm/blob/bb266fb5/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index ae5d531..5ea5415 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
## 0.11.0
+ * STORM-1189: Maintain wire compatability with 0.10.x versions of storm.
* STORM-1185: replace nimbus.host with nimbus.seeds
* STORM-1164: Code cleanup for typos, warnings and conciseness.
* STORM-902: Simple Log Search.
http://git-wip-us.apache.org/repos/asf/storm/blob/bb266fb5/dev-tools/travis/travis-script.sh
----------------------------------------------------------------------
diff --git a/dev-tools/travis/travis-script.sh b/dev-tools/travis/travis-script.sh
index f388d4d..325915e 100755
--- a/dev-tools/travis/travis-script.sh
+++ b/dev-tools/travis/travis-script.sh
@@ -32,7 +32,7 @@ cd ${STORM_SRC_ROOT_DIR}
export STORM_TEST_TIMEOUT_MS=100000
# We now lean on Travis CI's implicit behavior, ```mvn clean install -DskipTests``` before running script
-mvn --batch-mode install -fae -Pnative
+mvn --batch-mode test -fae -Pnative -pl $2
BUILD_RET_VAL=$?
for dir in `find . -type d -and -wholename \*/target/\*-reports`;
[2/4] storm git commit: Merge branch 'master' into STORM-1340
Posted by kn...@apache.org.
Merge branch 'master' into STORM-1340
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/ba6ace80
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/ba6ace80
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/ba6ace80
Branch: refs/heads/master
Commit: ba6ace80f4a88a141239e7028509b16f8595fad1
Parents: bb266fb 45792dd
Author: Kyle Nusbaum <Ky...@gmail.com>
Authored: Mon Nov 23 16:34:59 2015 -0600
Committer: Kyle Nusbaum <Ky...@gmail.com>
Committed: Mon Nov 23 16:34:59 2015 -0600
----------------------------------------------------------------------
CHANGELOG.md | 16 +
DEVELOPER.md | 2 +
LICENSE | 29 +
README.markdown | 3 +
bin/storm.py | 54 +-
conf/defaults.yaml | 14 +
dev-tools/travis/travis-script.sh | 4 +-
docs/documentation/Pacemaker.md | 108 +++
.../documentation/Setting-up-a-Storm-cluster.md | 19 +
docs/documentation/Windowing.md | 144 +++
docs/documentation/ui-rest-api.md | 16 +-
.../storm/starter/SlidingWindowTopology.java | 185 ++++
log4j2/cluster.xml | 12 +-
log4j2/worker.xml | 10 +-
pom.xml | 3 +-
storm-core/pom.xml | 7 +-
storm-core/src/clj/backtype/storm/cluster.clj | 279 ++----
.../cluster_state/zookeeper_state_factory.clj | 157 ++++
.../clj/backtype/storm/command/healthcheck.clj | 88 ++
.../clj/backtype/storm/command/heartbeats.clj | 52 ++
storm-core/src/clj/backtype/storm/config.clj | 13 +
.../src/clj/backtype/storm/daemon/executor.clj | 107 ++-
.../src/clj/backtype/storm/daemon/logviewer.clj | 60 +-
.../src/clj/backtype/storm/daemon/nimbus.clj | 97 +-
.../clj/backtype/storm/daemon/supervisor.clj | 11 +
.../src/clj/backtype/storm/daemon/worker.clj | 64 +-
.../src/clj/backtype/storm/messaging/loader.clj | 76 +-
.../src/clj/backtype/storm/messaging/local.clj | 72 +-
storm-core/src/clj/backtype/storm/stats.clj | 88 +-
storm-core/src/clj/backtype/storm/ui/core.clj | 21 +-
storm-core/src/clj/backtype/storm/util.clj | 16 +
.../org/apache/storm/pacemaker/pacemaker.clj | 237 +++++
.../storm/pacemaker/pacemaker_state_factory.clj | 124 +++
storm-core/src/genthrift.sh | 2 +-
storm-core/src/jvm/backtype/storm/Config.java | 131 ++-
.../backtype/storm/cluster/ClusterState.java | 208 +++++
.../storm/cluster/ClusterStateContext.java | 41 +
.../storm/cluster/ClusterStateFactory.java | 28 +
.../storm/cluster/ClusterStateListener.java | 22 +
.../backtype/storm/cluster/ConnectionState.java | 24 +
.../jvm/backtype/storm/cluster/DaemonType.java | 27 +
.../storm/generated/AlreadyAliveException.java | 11 +-
.../backtype/storm/generated/Assignment.java | 4 +-
.../storm/generated/AuthorizationException.java | 4 +-
.../src/jvm/backtype/storm/generated/Bolt.java | 4 +-
.../storm/generated/BoltAggregateStats.java | 12 +-
.../jvm/backtype/storm/generated/BoltStats.java | 4 +-
.../storm/generated/ClusterSummary.java | 6 +-
.../storm/generated/ClusterWorkerHeartbeat.java | 8 +-
.../storm/generated/CommonAggregateStats.java | 16 +-
.../generated/ComponentAggregateStats.java | 4 +-
.../storm/generated/ComponentCommon.java | 6 +-
.../storm/generated/ComponentObject.java | 2 +-
.../storm/generated/ComponentPageInfo.java | 10 +-
.../backtype/storm/generated/ComponentType.java | 2 +-
.../backtype/storm/generated/Credentials.java | 4 +-
.../storm/generated/DRPCExecutionException.java | 4 +-
.../backtype/storm/generated/DRPCRequest.java | 4 +-
.../backtype/storm/generated/DebugOptions.java | 8 +-
.../storm/generated/DistributedRPC.java | 4 +-
.../generated/DistributedRPCInvocations.java | 4 +-
.../jvm/backtype/storm/generated/ErrorInfo.java | 8 +-
.../storm/generated/ExecutorAggregateStats.java | 4 +-
.../backtype/storm/generated/ExecutorInfo.java | 8 +-
.../storm/generated/ExecutorSpecificStats.java | 2 +-
.../backtype/storm/generated/ExecutorStats.java | 6 +-
.../storm/generated/ExecutorSummary.java | 8 +-
.../storm/generated/GetInfoOptions.java | 4 +-
.../storm/generated/GlobalStreamId.java | 4 +-
.../jvm/backtype/storm/generated/Grouping.java | 2 +-
.../generated/HBAuthorizationException.java | 406 ++++++++
.../storm/generated/HBExecutionException.java | 406 ++++++++
.../jvm/backtype/storm/generated/HBMessage.java | 636 +++++++++++++
.../backtype/storm/generated/HBMessageData.java | 640 +++++++++++++
.../jvm/backtype/storm/generated/HBNodes.java | 461 +++++++++
.../jvm/backtype/storm/generated/HBPulse.java | 522 +++++++++++
.../jvm/backtype/storm/generated/HBRecords.java | 466 +++++++++
.../storm/generated/HBServerMessageType.java | 113 +++
.../generated/InvalidTopologyException.java | 4 +-
.../backtype/storm/generated/JavaObject.java | 4 +-
.../backtype/storm/generated/JavaObjectArg.java | 2 +-
.../backtype/storm/generated/KillOptions.java | 6 +-
.../storm/generated/LSApprovedWorkers.java | 4 +-
.../generated/LSSupervisorAssignments.java | 4 +-
.../storm/generated/LSSupervisorId.java | 4 +-
.../backtype/storm/generated/LSTopoHistory.java | 6 +-
.../storm/generated/LSTopoHistoryList.java | 4 +-
.../storm/generated/LSWorkerHeartbeat.java | 8 +-
.../storm/generated/LocalAssignment.java | 4 +-
.../storm/generated/LocalStateData.java | 4 +-
.../jvm/backtype/storm/generated/LogConfig.java | 52 +-
.../jvm/backtype/storm/generated/LogLevel.java | 8 +-
.../storm/generated/LogLevelAction.java | 2 +-
.../jvm/backtype/storm/generated/Nimbus.java | 48 +-
.../backtype/storm/generated/NimbusSummary.java | 10 +-
.../jvm/backtype/storm/generated/NodeInfo.java | 4 +-
.../storm/generated/NotAliveException.java | 4 +-
.../backtype/storm/generated/NullStruct.java | 4 +-
.../storm/generated/NumErrorsChoice.java | 2 +-
.../backtype/storm/generated/ProfileAction.java | 2 +-
.../storm/generated/ProfileRequest.java | 6 +-
.../storm/generated/RebalanceOptions.java | 8 +-
.../storm/generated/ShellComponent.java | 4 +-
.../storm/generated/SpecificAggregateStats.java | 2 +-
.../storm/generated/SpoutAggregateStats.java | 6 +-
.../jvm/backtype/storm/generated/SpoutSpec.java | 4 +-
.../backtype/storm/generated/SpoutStats.java | 4 +-
.../storm/generated/StateSpoutSpec.java | 4 +-
.../jvm/backtype/storm/generated/StormBase.java | 8 +-
.../backtype/storm/generated/StormTopology.java | 4 +-
.../backtype/storm/generated/StreamInfo.java | 6 +-
.../backtype/storm/generated/SubmitOptions.java | 4 +-
.../storm/generated/SupervisorInfo.java | 8 +-
.../storm/generated/SupervisorSummary.java | 216 ++++-
.../storm/generated/ThriftSerializedObject.java | 4 +-
.../storm/generated/TopologyActionOptions.java | 2 +-
.../storm/generated/TopologyHistoryInfo.java | 4 +-
.../backtype/storm/generated/TopologyInfo.java | 20 +-
.../storm/generated/TopologyInitialStatus.java | 2 +-
.../storm/generated/TopologyPageInfo.java | 26 +-
.../backtype/storm/generated/TopologyStats.java | 4 +-
.../storm/generated/TopologyStatus.java | 2 +-
.../storm/generated/TopologySummary.java | 26 +-
.../storm/generated/WorkerResources.java | 10 +-
.../storm/messaging/AddressedTuple.java | 46 +
.../DeserializingConnectionCallback.java | 60 ++
.../backtype/storm/messaging/IConnection.java | 10 +-
.../storm/messaging/IConnectionCallback.java | 31 +
.../backtype/storm/messaging/local/Context.java | 164 ++++
.../backtype/storm/messaging/netty/Client.java | 3 +-
.../storm/messaging/netty/ControlMessage.java | 17 +-
.../messaging/netty/INettySerializable.java | 26 +
.../netty/KerberosSaslClientHandler.java | 152 +++
.../netty/KerberosSaslNettyClient.java | 203 ++++
.../netty/KerberosSaslNettyClientState.java | 31 +
.../netty/KerberosSaslNettyServer.java | 210 +++++
.../netty/KerberosSaslNettyServerState.java | 30 +
.../netty/KerberosSaslServerHandler.java | 133 +++
.../storm/messaging/netty/MessageDecoder.java | 4 +-
.../netty/NettyRenameThreadFactory.java | 10 +-
.../netty/NettyUncaughtExceptionHandler.java | 35 +
.../storm/messaging/netty/SaslMessageToken.java | 37 +-
.../storm/messaging/netty/SaslNettyClient.java | 22 +-
.../storm/messaging/netty/SaslNettyServer.java | 244 +++--
.../messaging/netty/SaslNettyServerState.java | 13 +-
.../messaging/netty/SaslStormServerHandler.java | 21 +-
.../storm/messaging/netty/SaslUtils.java | 1 +
.../backtype/storm/messaging/netty/Server.java | 163 +---
.../messaging/netty/StormServerHandler.java | 24 +-
.../metric/internal/LatencyStatAndMetric.java | 13 +-
.../nimbus/ITopologyActionNotifierPlugin.java | 43 +
.../jvm/backtype/storm/scheduler/Cluster.java | 115 ++-
.../resource/ResourceAwareScheduler.java | 18 +-
.../backtype/storm/security/auth/AuthUtils.java | 69 ++
.../security/auth/SimpleTransportPlugin.java | 2 +-
.../backtype/storm/task/OutputCollector.java | 2 +-
.../backtype/storm/topology/IWindowedBolt.java | 40 +
.../storm/topology/TopologyBuilder.java | 17 +
.../storm/topology/WindowedBoltExecutor.java | 224 +++++
.../storm/topology/base/BaseWindowedBolt.java | 179 ++++
.../backtype/storm/tuple/AddressedTuple.java | 48 +
.../backtype/storm/utils/DisruptorQueue.java | 187 +++-
.../src/jvm/backtype/storm/utils/Utils.java | 102 ++
.../storm/validation/ConfigValidation.java | 20 +-
.../storm/windowing/CountEvictionPolicy.java | 68 ++
.../storm/windowing/CountTriggerPolicy.java | 63 ++
.../src/jvm/backtype/storm/windowing/Event.java | 41 +
.../jvm/backtype/storm/windowing/EventImpl.java | 38 +
.../storm/windowing/EvictionPolicy.java | 42 +
.../storm/windowing/TimeEvictionPolicy.java | 52 ++
.../storm/windowing/TimeTriggerPolicy.java | 115 +++
.../storm/windowing/TriggerHandler.java | 29 +
.../backtype/storm/windowing/TriggerPolicy.java | 42 +
.../backtype/storm/windowing/TupleWindow.java | 26 +
.../storm/windowing/TupleWindowImpl.java | 61 ++
.../jvm/backtype/storm/windowing/Window.java | 48 +
.../windowing/WindowLifecycleListener.java | 42 +
.../backtype/storm/windowing/WindowManager.java | 212 +++++
.../storm/pacemaker/IServerMessageHandler.java | 25 +
.../apache/storm/pacemaker/PacemakerClient.java | 255 +++++
.../storm/pacemaker/PacemakerClientHandler.java | 75 ++
.../apache/storm/pacemaker/PacemakerServer.java | 163 ++++
.../storm/pacemaker/codec/ThriftDecoder.java | 76 ++
.../storm/pacemaker/codec/ThriftEncoder.java | 110 +++
.../pacemaker/codec/ThriftNettyClientCodec.java | 94 ++
.../pacemaker/codec/ThriftNettyServerCodec.java | 99 ++
.../src/jvm/storm/trident/TridentTopology.java | 36 +-
.../jvm/storm/trident/graph/GraphGrouper.java | 11 +-
.../jvm/storm/trident/spout/IBatchSpout.java | 2 +-
.../spout/IOpaquePartitionedTridentSpout.java | 3 +-
.../trident/spout/IPartitionedTridentSpout.java | 2 +-
.../storm/trident/spout/ITridentDataSource.java | 26 +
.../jvm/storm/trident/spout/ITridentSpout.java | 2 +-
.../jvm/storm/trident/util/TridentUtils.java | 33 +-
storm-core/src/py/storm/DistributedRPC-remote | 2 +-
storm-core/src/py/storm/DistributedRPC.py | 20 +-
.../py/storm/DistributedRPCInvocations-remote | 2 +-
.../src/py/storm/DistributedRPCInvocations.py | 41 +-
storm-core/src/py/storm/Nimbus-remote | 2 +-
storm-core/src/py/storm/Nimbus.py | 457 ++++++---
storm-core/src/py/storm/constants.py | 2 +-
storm-core/src/py/storm/ttypes.py | 934 ++++++++++++++++---
storm-core/src/storm.thrift | 61 ++
storm-core/src/ui/public/css/style.css | 8 +
storm-core/src/ui/public/images/bug.png | Bin 0 -> 4045 bytes
storm-core/src/ui/public/images/statistic.png | Bin 0 -> 488 bytes
storm-core/src/ui/public/index.html | 4 +-
.../public/templates/index-page-template.html | 36 +
.../templates/topology-page-template.html | 6 +
.../src/ui/public/templates/user-template.html | 22 +-
storm-core/src/ui/public/topology.html | 7 +-
.../test/clj/backtype/storm/cluster_test.clj | 7 +-
.../storm/messaging/netty_unit_test.clj | 122 +--
.../test/clj/backtype/storm/messaging_test.clj | 25 -
.../test/clj/backtype/storm/metrics_test.clj | 2 +-
.../test/clj/backtype/storm/nimbus_test.clj | 97 +-
.../storm/pacemaker_state_factory_test.clj | 150 +++
.../clj/org/apache/storm/pacemaker_test.clj | 242 +++++
.../jvm/backtype/storm/TestConfigValidate.java | 18 +
.../nimbus/InMemoryTopologyActionNotifier.java | 53 ++
.../storm/utils/DisruptorQueueTest.java | 41 +-
.../storm/windowing/WindowManagerTest.java | 250 +++++
.../jvm/storm/trident/TestTridentTopology.java | 76 ++
storm-dist/binary/LICENSE | 29 +
224 files changed, 12822 insertions(+), 1616 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/ba6ace80/dev-tools/travis/travis-script.sh
----------------------------------------------------------------------
diff --cc dev-tools/travis/travis-script.sh
index 325915e,67fe954..a302e23
--- a/dev-tools/travis/travis-script.sh
+++ b/dev-tools/travis/travis-script.sh
@@@ -28,11 -28,11 +28,11 @@@ TRAVIS_SCRIPT_DIR=$( cd "$( dirname "${
cd ${STORM_SRC_ROOT_DIR}
- # We should concern that Travis CI could be very slow cause it uses VM
- export STORM_TEST_TIMEOUT_MS=100000
+ # We should be concerned that Travis CI could be very slow because it uses VM
+ export STORM_TEST_TIMEOUT_MS=150000
# We now lean on Travis CI's implicit behavior, ```mvn clean install -DskipTests``` before running script
-mvn --batch-mode install -fae -Pnative
+mvn --batch-mode test -fae -Pnative -pl $2
BUILD_RET_VAL=$?
for dir in `find . -type d -and -wholename \*/target/\*-reports`;
[4/4] storm git commit: Adding STORM-1340 to CHANGELOG.md
Posted by kn...@apache.org.
Adding STORM-1340 to CHANGELOG.md
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/e2d267ff
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/e2d267ff
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/e2d267ff
Branch: refs/heads/master
Commit: e2d267ff9aab1b0a53cdf94e8880d57e64816179
Parents: 53a4604
Author: Kyle Nusbaum <Ky...@gmail.com>
Authored: Tue Nov 24 14:55:19 2015 -0600
Committer: Kyle Nusbaum <Ky...@gmail.com>
Committed: Tue Nov 24 14:55:19 2015 -0600
----------------------------------------------------------------------
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/e2d267ff/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index ccae7d0..2661422 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
+## 0.11.0
+ * STORM-1340: Use Travis-CI build matrix to improve test execution times
* STORM-1126: Allow a configMethod that takes no arguments (Flux)
* STORM-1203: worker metadata file creation doesn't use storm.log.dir config
* STORM-1349: [Flux] Allow constructorArgs to take Maps as arguments
[3/4] storm git commit: Merge branch 'STORM-1340' of
https://github.com/knusbaum/incubator-storm
Posted by kn...@apache.org.
Merge branch 'STORM-1340' of https://github.com/knusbaum/incubator-storm
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/53a46047
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/53a46047
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/53a46047
Branch: refs/heads/master
Commit: 53a46047d18cb79a2360869ef864bb68a77447bb
Parents: f8a2d65 ba6ace8
Author: Kyle Nusbaum <Ky...@gmail.com>
Authored: Tue Nov 24 14:04:39 2015 -0600
Committer: Kyle Nusbaum <Ky...@gmail.com>
Committed: Tue Nov 24 14:04:39 2015 -0600
----------------------------------------------------------------------
.travis.yml | 13 ++++++++++++-
dev-tools/travis/travis-script.sh | 2 +-
2 files changed, 13 insertions(+), 2 deletions(-)
----------------------------------------------------------------------