storm-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bo...@apache.org
Subject [2/5] storm git commit: Merge remote-tracking branch 'upstream/0.10.x-branch' into STORM-763_0.10.x
Date Tue, 14 Jul 2015 19:06:01 GMT
Merge remote-tracking branch 'upstream/0.10.x-branch' into STORM-763_0.10.x

# Conflicts:
#	storm-core/src/jvm/backtype/storm/messaging/netty/Client.java


Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/a2502c3b
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/a2502c3b
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/a2502c3b

Branch: refs/heads/0.10.x-branch
Commit: a2502c3bc3bcd4caf3800bb645058abb61d2a071
Parents: 286bacd 4dd2571
Author: Enno Shioji <eshioji@gmail.com>
Authored: Fri Jul 3 00:51:32 2015 +0100
Committer: Enno Shioji <eshioji@gmail.com>
Committed: Fri Jul 3 00:51:32 2015 +0100

----------------------------------------------------------------------
 .gitignore                                      |   1 +
 .travis.yml                                     |  20 +
 CHANGELOG.md                                    | 241 ++++--
 DEVELOPER.md                                    |   4 +-
 LICENSE                                         |  33 +-
 NOTICE                                          |   4 +-
 README.markdown                                 |   9 +-
 SECURITY.md                                     |  50 ++
 STORM-UI-REST-API.md                            |  30 -
 bin/storm-config.cmd                            |   4 +-
 bin/storm.py                                    |  55 +-
 conf/defaults.yaml                              |   1 -
 conf/jaas_kerberos.conf                         |  17 +
 conf/log4j2.xml                                 |  32 +
 conf/logback.xml                                |  28 -
 dev-tools/test-ns.py                            |  34 +-
 .../print-errors-from-clojure-test-reports.py   |  58 ++
 dev-tools/travis/travis-build.sh                |  50 ++
 doap_Storm.rdf                                  |   6 +-
 docs/_posts/2015-03-25-storm094-released.md     |  24 +
 docs/_posts/2015-06-04-storm095-released.md     |  23 +
 docs/documentation/Metrics.md                   |   2 +-
 .../documentation/Setting-up-a-Storm-cluster.md |   7 +-
 docs/documentation/Trident-API-Overview.md      |   2 +-
 docs/downloads.html                             |  89 +-
 examples/storm-starter/README.markdown          |   8 +-
 examples/storm-starter/pom.xml                  |   8 +-
 external/flux/.gitignore                        |  15 +
 external/flux/README.md                         | 834 +++++++++++++++++++
 external/flux/flux-core/pom.xml                 |  96 +++
 .../main/java/org/apache/storm/flux/Flux.java   | 263 ++++++
 .../java/org/apache/storm/flux/FluxBuilder.java | 595 +++++++++++++
 .../apache/storm/flux/api/TopologySource.java   |  39 +
 .../org/apache/storm/flux/model/BeanDef.java    |  39 +
 .../apache/storm/flux/model/BeanReference.java  |  39 +
 .../org/apache/storm/flux/model/BoltDef.java    |  24 +
 .../storm/flux/model/ConfigMethodDef.java       |  62 ++
 .../storm/flux/model/ExecutionContext.java      |  77 ++
 .../apache/storm/flux/model/GroupingDef.java    |  77 ++
 .../org/apache/storm/flux/model/IncludeDef.java |  54 ++
 .../org/apache/storm/flux/model/ObjectDef.java  |  90 ++
 .../apache/storm/flux/model/PropertyDef.java    |  58 ++
 .../org/apache/storm/flux/model/SpoutDef.java   |  24 +
 .../org/apache/storm/flux/model/StreamDef.java  |  64 ++
 .../apache/storm/flux/model/TopologyDef.java    | 216 +++++
 .../storm/flux/model/TopologySourceDef.java     |  36 +
 .../org/apache/storm/flux/model/VertexDef.java  |  36 +
 .../apache/storm/flux/parser/FluxParser.java    | 202 +++++
 .../flux-core/src/main/resources/splash.txt     |   9 +
 .../org/apache/storm/flux/FluxBuilderTest.java  |  31 +
 .../org/apache/storm/flux/IntegrationTest.java  |  39 +
 .../java/org/apache/storm/flux/TCKTest.java     | 245 ++++++
 .../multilang/MultilangEnvirontmentTest.java    |  89 ++
 .../apache/storm/flux/test/SimpleTopology.java  |  59 ++
 .../storm/flux/test/SimpleTopologySource.java   |  52 ++
 .../test/SimpleTopologyWithConfigParam.java     |  55 ++
 .../org/apache/storm/flux/test/TestBolt.java    |  80 ++
 .../storm/flux/test/TridentTopologySource.java  |  71 ++
 .../src/test/resources/configs/bad_hbase.yaml   |  98 +++
 .../resources/configs/config-methods-test.yaml  |  70 ++
 .../resources/configs/diamond-topology.yaml     |  87 ++
 .../existing-topology-method-override.yaml      |  25 +
 .../existing-topology-reflection-config.yaml    |  24 +
 .../configs/existing-topology-reflection.yaml   |  24 +
 .../configs/existing-topology-trident.yaml      |  24 +
 .../resources/configs/existing-topology.yaml    |  23 +
 .../src/test/resources/configs/hdfs_test.yaml   |  97 +++
 .../test/resources/configs/include_test.yaml    |  25 +
 .../configs/invalid-existing-topology.yaml      |  33 +
 .../src/test/resources/configs/kafka_test.yaml  | 126 +++
 .../src/test/resources/configs/shell_test.yaml  | 104 +++
 .../test/resources/configs/simple_hbase.yaml    | 120 +++
 .../resources/configs/substitution-test.yaml    | 106 +++
 .../src/test/resources/configs/tck.yaml         |  95 +++
 .../src/test/resources/configs/test.properties  |  18 +
 .../flux-core/src/test/resources/logback.xml    |  30 +
 external/flux/flux-examples/README.md           |  66 ++
 external/flux/flux-examples/pom.xml             | 105 +++
 .../storm/flux/examples/WordCountClient.java    |  74 ++
 .../apache/storm/flux/examples/WordCounter.java |  71 ++
 .../src/main/resources/hbase_bolt.properties    |  18 +
 .../src/main/resources/hdfs_bolt.properties     |  26 +
 .../src/main/resources/kafka_spout.yaml         | 136 +++
 .../src/main/resources/multilang.yaml           |  89 ++
 .../src/main/resources/simple_hbase.yaml        |  92 ++
 .../src/main/resources/simple_hdfs.yaml         | 105 +++
 .../src/main/resources/simple_wordcount.yaml    |  68 ++
 external/flux/flux-ui/README.md                 |   3 +
 external/flux/flux-wrappers/pom.xml             |  51 ++
 .../flux/wrappers/bolts/FluxShellBolt.java      |  56 ++
 .../storm/flux/wrappers/bolts/LogInfoBolt.java  |  44 +
 .../flux/wrappers/spouts/FluxShellSpout.java    |  55 ++
 .../main/resources/resources/randomsentence.js  |  93 +++
 .../main/resources/resources/splitsentence.py   |  24 +
 external/flux/pom.xml                           | 119 +++
 external/storm-eventhubs/README.md              |  41 +
 external/storm-eventhubs/pom.xml                | 113 +++
 .../eventhubs/bolt/DefaultEventDataFormat.java  |  47 ++
 .../storm/eventhubs/bolt/EventHubBolt.java      | 101 +++
 .../eventhubs/bolt/EventHubBoltConfig.java      | 109 +++
 .../storm/eventhubs/bolt/IEventDataFormat.java  |  28 +
 .../eventhubs/samples/AtMostOnceEventCount.java |  54 ++
 .../storm/eventhubs/samples/EventCount.java     | 158 ++++
 .../storm/eventhubs/samples/EventHubLoop.java   |  52 ++
 .../samples/OpaqueTridentEventCount.java        |  53 ++
 .../samples/TransactionalTridentEventCount.java |  81 ++
 .../eventhubs/samples/bolt/GlobalCountBolt.java |  83 ++
 .../samples/bolt/PartialCountBolt.java          |  63 ++
 .../apache/storm/eventhubs/spout/EventData.java |  48 ++
 .../storm/eventhubs/spout/EventDataScheme.java  |  55 ++
 .../eventhubs/spout/EventHubReceiverImpl.java   | 149 ++++
 .../storm/eventhubs/spout/EventHubSpout.java    | 263 ++++++
 .../eventhubs/spout/EventHubSpoutConfig.java    | 179 ++++
 .../eventhubs/spout/EventHubSpoutException.java |  37 +
 .../storm/eventhubs/spout/FieldConstants.java   |  25 +
 .../storm/eventhubs/spout/IEventDataScheme.java |  30 +
 .../eventhubs/spout/IEventHubReceiver.java      |  36 +
 .../spout/IEventHubReceiverFactory.java         |  30 +
 .../eventhubs/spout/IPartitionCoordinator.java  |  27 +
 .../eventhubs/spout/IPartitionManager.java      |  37 +
 .../spout/IPartitionManagerFactory.java         |  33 +
 .../storm/eventhubs/spout/IStateStore.java      |  31 +
 .../apache/storm/eventhubs/spout/MessageId.java |  56 ++
 .../storm/eventhubs/spout/PartitionManager.java | 101 +++
 .../eventhubs/spout/SimplePartitionManager.java | 139 ++++
 .../spout/StaticPartitionCoordinator.java       |  85 ++
 .../eventhubs/spout/ZookeeperStateStore.java    |  95 +++
 .../storm/eventhubs/trident/Coordinator.java    |  60 ++
 .../trident/ITridentPartitionManager.java       |  35 +
 .../ITridentPartitionManagerFactory.java        |  26 +
 .../trident/OpaqueTridentEventHubEmitter.java   |  69 ++
 .../trident/OpaqueTridentEventHubSpout.java     |  64 ++
 .../storm/eventhubs/trident/Partition.java      |  39 +
 .../storm/eventhubs/trident/Partitions.java     |  41 +
 .../TransactionalTridentEventHubEmitter.java    | 167 ++++
 .../TransactionalTridentEventHubSpout.java      |  66 ++
 .../trident/TridentPartitionManager.java        |  93 +++
 .../src/main/resources/config.properties        |  45 +
 .../eventhubs/spout/EventHubReceiverMock.java   |  97 +++
 .../spout/EventHubSpoutCallerMock.java          |  96 +++
 .../spout/PartitionManagerCallerMock.java       | 105 +++
 .../spout/SpoutOutputCollectorMock.java         |  61 ++
 .../storm/eventhubs/spout/StateStoreMock.java   |  54 ++
 .../storm/eventhubs/spout/TestEventData.java    |  47 ++
 .../eventhubs/spout/TestEventHubSpout.java      |  72 ++
 .../eventhubs/spout/TestPartitionManager.java   | 117 +++
 .../TestTransactionalTridentEmitter.java        |  93 +++
 .../eventhubs/trident/TridentCollectorMock.java |  52 ++
 external/storm-hbase/LICENSE                    | 202 -----
 external/storm-hbase/pom.xml                    |   2 +-
 .../org/apache/storm/hbase/bolt/HBaseBolt.java  |   2 +-
 .../storm/hbase/bolt/HBaseLookupBolt.java       |   4 +-
 .../mapper/SimpleTridentHBaseMapMapper.java     |  50 ++
 .../trident/mapper/TridentHBaseMapMapper.java   |  40 +
 .../hbase/trident/state/HBaseMapState.java      |  47 +-
 .../storm/hbase/trident/state/HBaseState.java   |   2 +-
 external/storm-hdfs/pom.xml                     |   6 +-
 .../org/apache/storm/hdfs/bolt/HdfsBolt.java    |   2 +-
 .../storm/hdfs/bolt/SequenceFileBolt.java       |   2 +-
 .../hdfs/common/security/HdfsSecurityUtil.java  |   5 +-
 external/storm-hive/pom.xml                     |  26 +-
 .../storm/hive/trident/HiveStateFactory.java    |  17 +
 .../apache/storm/hive/trident/HiveUpdater.java  |  17 +
 external/storm-jdbc/LICENSE                     | 202 -----
 external/storm-jdbc/README.md                   |  72 +-
 external/storm-jdbc/pom.xml                     |   8 +-
 .../storm/jdbc/bolt/AbstractJdbcBolt.java       |  17 +-
 .../apache/storm/jdbc/bolt/JdbcInsertBolt.java  |   5 +-
 .../apache/storm/jdbc/bolt/JdbcLookupBolt.java  |   5 +-
 .../org/apache/storm/jdbc/common/Column.java    |   7 +-
 .../storm/jdbc/common/ConnectionProvider.java   |  43 +
 .../jdbc/common/HikariCPConnectionProvider.java |  63 ++
 .../apache/storm/jdbc/common/JdbcClient.java    |  19 +-
 .../storm/jdbc/mapper/JdbcLookupMapper.java     |  17 +
 .../jdbc/mapper/SimpleJdbcLookupMapper.java     |  17 +
 .../storm/jdbc/mapper/SimpleJdbcMapper.java     |   6 +-
 .../storm/jdbc/trident/state/JdbcState.java     |  13 +-
 .../storm/jdbc/common/JdbcClientTest.java       |   5 +-
 .../jdbc/topology/AbstractUserTopology.java     |  17 +-
 .../jdbc/topology/UserPersistanceTopology.java  |  18 +-
 .../UserPersistanceTridentTopology.java         |   2 +-
 external/storm-jdbc/src/test/sql/test.sql       |  17 +
 external/storm-kafka/README.md                  |  55 +-
 external/storm-kafka/pom.xml                    |  10 +-
 .../jvm/storm/kafka/DynamicBrokersReader.java   |  26 +
 .../src/jvm/storm/kafka/KafkaUtils.java         |  16 +-
 .../storm/kafka/DynamicBrokersReaderTest.java   |  13 +
 .../ExponentialBackoffMsgRetryManagerTest.java  |  17 +
 external/storm-redis/LICENSE                    | 202 -----
 external/storm-redis/README.md                  | 128 ++-
 external/storm-redis/pom.xml                    |   4 +-
 .../storm/redis/bolt/AbstractRedisBolt.java     |   8 +-
 .../storm/redis/bolt/RedisLookupBolt.java       | 112 +++
 .../apache/storm/redis/bolt/RedisStoreBolt.java | 100 +++
 .../redis/common/config/JedisClusterConfig.java |  82 ++
 .../redis/common/config/JedisPoolConfig.java    |  97 +++
 .../common/container/JedisClusterContainer.java |  47 ++
 .../JedisCommandsContainerBuilder.java          |  38 +
 .../JedisCommandsInstanceContainer.java         |  25 +
 .../redis/common/container/JedisContainer.java  |  60 ++
 .../common/mapper/RedisDataTypeDescription.java |  50 ++
 .../redis/common/mapper/RedisLookupMapper.java  |  40 +
 .../storm/redis/common/mapper/RedisMapper.java  |  22 +
 .../redis/common/mapper/RedisStoreMapper.java   |  21 +
 .../storm/redis/common/mapper/TupleMapper.java  |  27 +
 .../trident/mapper/TridentTupleMapper.java      |  27 -
 .../trident/state/AbstractRedisMapState.java    |  96 +++
 .../state/AbstractRedisStateQuerier.java        |  69 ++
 .../state/AbstractRedisStateUpdater.java        |  69 ++
 .../storm/redis/trident/state/KeyFactory.java   |  35 +
 .../storm/redis/trident/state/Options.java      |  34 +
 .../trident/state/RedisClusterMapState.java     | 162 ++--
 .../redis/trident/state/RedisClusterState.java  |   2 +-
 .../trident/state/RedisClusterStateQuerier.java |  60 +-
 .../trident/state/RedisClusterStateUpdater.java |  69 +-
 .../redis/trident/state/RedisMapState.java      | 212 ++---
 .../storm/redis/trident/state/RedisState.java   |   2 +-
 .../redis/trident/state/RedisStateQuerier.java  |  54 +-
 .../redis/trident/state/RedisStateUpdater.java  |  73 +-
 .../redis/util/config/JedisClusterConfig.java   |  82 --
 .../redis/util/config/JedisPoolConfig.java      |  97 ---
 .../util/container/JedisClusterContainer.java   |  47 --
 .../JedisCommandsContainerBuilder.java          |  38 -
 .../JedisCommandsInstanceContainer.java         |  25 -
 .../redis/util/container/JedisContainer.java    |  65 --
 .../storm/redis/topology/LookupWordCount.java   | 115 ++-
 .../redis/topology/PersistentWordCount.java     |  81 +-
 .../storm/redis/topology/WordCounter.java       |  19 +-
 .../redis/trident/WordCountLookupMapper.java    |  57 ++
 .../redis/trident/WordCountStoreMapper.java     |  39 +
 .../redis/trident/WordCountTridentRedis.java    |  15 +-
 .../trident/WordCountTridentRedisCluster.java   |  13 +-
 .../WordCountTridentRedisClusterMap.java        |  12 +-
 .../redis/trident/WordCountTridentRedisMap.java |  13 +-
 .../redis/trident/WordCountTupleMapper.java     |  16 -
 log4j2/cluster.xml                              |  76 ++
 log4j2/worker.xml                               |  77 ++
 logback/cluster.xml                             |  85 --
 logback/worker.xml                              |  41 -
 pom.xml                                         |  72 +-
 .../maven-shade-clojure-transformer/pom.xml     |   2 +-
 storm-buildtools/storm-maven-plugins/pom.xml    |   5 +-
 storm-core/pom.xml                              | 242 +++++-
 storm-core/src/clj/backtype/storm/cluster.clj   |   5 +-
 storm-core/src/clj/backtype/storm/config.clj    |   2 +-
 storm-core/src/clj/backtype/storm/converter.clj |  26 +-
 .../src/clj/backtype/storm/daemon/drpc.clj      |  21 +-
 .../src/clj/backtype/storm/daemon/executor.clj  |   9 +-
 .../src/clj/backtype/storm/daemon/logviewer.clj |  12 +-
 .../src/clj/backtype/storm/daemon/nimbus.clj    |  24 +-
 .../clj/backtype/storm/daemon/supervisor.clj    |  19 +-
 .../src/clj/backtype/storm/daemon/worker.clj    |  23 +-
 .../src/clj/backtype/storm/messaging/loader.clj |  13 +-
 storm-core/src/clj/backtype/storm/testing.clj   |  19 +-
 storm-core/src/clj/backtype/storm/ui/core.clj   |  59 +-
 .../src/clj/backtype/storm/ui/helpers.clj       |  66 +-
 storm-core/src/clj/backtype/storm/util.clj      |  46 +-
 .../src/dev/drpc-simple-acl-test-scenario.yaml  |  17 +
 storm-core/src/jvm/backtype/storm/Config.java   | 118 ++-
 .../src/jvm/backtype/storm/LogWriter.java       |  83 ++
 .../src/jvm/backtype/storm/drpc/DRPCSpout.java  |   8 +-
 .../jvm/backtype/storm/generated/Nimbus.java    |  12 +-
 .../storm/messaging/ConnectionWithStatus.java   |  17 +
 .../backtype/storm/messaging/netty/Client.java  |   2 +
 .../security/auth/SaslTransportPlugin.java      |  17 +-
 .../security/auth/SimpleTransportPlugin.java    |   3 +-
 .../auth/authorizer/DRPCAuthorizerBase.java     |  17 +
 .../authorizer/DRPCSimpleACLAuthorizer.java     |  18 +
 .../authorizer/ImpersonationAuthorizer.java     |  17 +
 .../auth/kerberos/jaas_kerberos_cluster.conf    |  20 +-
 .../auth/kerberos/jaas_kerberos_launcher.conf   |  19 +
 .../serialization/BlowfishTupleSerializer.java  |   5 +-
 .../src/jvm/backtype/storm/task/IBolt.java      |   4 +-
 .../storm/utils/ExtendedThreadPoolExecutor.java |  67 ++
 .../jvm/backtype/storm/utils/NimbusClient.java  |   7 +
 .../jvm/backtype/storm/utils/ShellProcess.java  |   8 +-
 .../backtype/storm/utils/TransferDrainer.java   |  62 +-
 .../src/jvm/backtype/storm/utils/Utils.java     | 171 +++-
 .../worker-launcher/.deps/worker-launcher.Po    |  16 +
 storm-core/src/py/storm/Nimbus.py               |   8 +
 storm-core/src/storm.thrift                     |   6 +
 .../src/ui/public/css/jsonFormatter.min.css     |   1 +
 storm-core/src/ui/public/css/style.css          |  73 +-
 storm-core/src/ui/public/index.html             |   3 +
 .../src/ui/public/js/jsonFormatter.min.js       |   2 +
 storm-core/src/ui/public/js/script.js           |   2 +-
 .../templates/component-page-template.html      |   8 +-
 .../templates/topology-page-template.html       |   4 +-
 storm-core/src/ui/public/topology.html          |   3 +
 .../test/clj/backtype/storm/logviewer_test.clj  |   8 +-
 .../auth/DefaultHttpCredentialsPlugin_test.clj  |  15 +
 .../authorizer/DRPCSimpleACLAuthorizer_test.clj |  15 +
 .../storm/security/auth/drpc-auth-alice.jaas    |  17 +
 .../storm/security/auth/drpc-auth-bob.jaas      |  17 +
 .../storm/security/auth/drpc-auth-charlie.jaas  |  17 +
 .../storm/security/auth/drpc-auth-server.jaas   |  17 +
 .../storm/security/auth/nimbus_auth_test.clj    | 233 +++---
 .../test/clj/backtype/storm/supervisor_test.clj |  30 +-
 .../clj/backtype/storm/transactional_test.clj   |   6 +-
 .../storm/utils/DisruptorQueueTest.java         |  38 +-
 storm-core/test/resources/log4j2-test.xml       |  32 +
 storm-dist/binary/LICENSE                       | 224 +++--
 storm-dist/binary/NOTICE                        |   4 +-
 storm-dist/binary/pom.xml                       |   2 +-
 storm-dist/binary/src/main/assembly/binary.xml  | 135 ++-
 storm-dist/source/pom.xml                       |   2 +-
 storm-multilang/javascript/pom.xml              |   2 +-
 storm-multilang/python/pom.xml                  |   2 +-
 storm-multilang/ruby/pom.xml                    |   2 +-
 309 files changed, 14900 insertions(+), 2427 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/a2502c3b/conf/defaults.yaml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/storm/blob/a2502c3b/storm-core/src/jvm/backtype/storm/messaging/netty/Client.java
----------------------------------------------------------------------
diff --cc storm-core/src/jvm/backtype/storm/messaging/netty/Client.java
index 9be2b06,ac3f3f2..30a3ba7
--- a/storm-core/src/jvm/backtype/storm/messaging/netty/Client.java
+++ b/storm-core/src/jvm/backtype/storm/messaging/netty/Client.java
@@@ -359,8 -514,11 +359,10 @@@ public class Client extends ConnectionW
      public void close() {
          if (!closing) {
              LOG.info("closing Netty Client {}", dstAddressPrefixedName);
+             context.removeClient(dstAddress.getHostName(),dstAddress.getPort());
+             context = null;
              // Set closing to true to prevent any further reconnection attempts.
              closing = true;
 -            flushPendingMessages();
              waitForPendingMessagesToBeSent();
              closeChannel();
          }


Mime
View raw message