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 2015/01/09 19:42:56 UTC

[1/6] storm git commit: STORM-552:add new config storm.messaging.netty.backlog, default value 500

Repository: storm
Updated Branches:
  refs/heads/master e71e2a3f7 -> a1268f110


STORM-552:add new config storm.messaging.netty.backlog,default value 500


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

Branch: refs/heads/master
Commit: d23495056f0b870e1ef4bebbae586965e2f21340
Parents: cfe7e63
Author: caofangkun <ca...@gmail.com>
Authored: Tue Nov 11 16:56:54 2014 +0800
Committer: caofangkun <ca...@gmail.com>
Committed: Tue Nov 11 16:56:54 2014 +0800

----------------------------------------------------------------------
 conf/defaults.yaml                                            | 3 ++-
 storm-core/src/jvm/backtype/storm/Config.java                 | 6 ++++++
 storm-core/src/jvm/backtype/storm/messaging/netty/Server.java | 2 ++
 3 files changed, 10 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/d2349505/conf/defaults.yaml
----------------------------------------------------------------------
diff --git a/conf/defaults.yaml b/conf/defaults.yaml
index 0050227..6ee9f91 100644
--- a/conf/defaults.yaml
+++ b/conf/defaults.yaml
@@ -116,7 +116,8 @@ storm.messaging.netty.min_wait_ms: 100
 
 # If the Netty messaging layer is busy(netty internal buffer not writable), the Netty client will try to batch message as more as possible up to the size of storm.messaging.netty.transfer.batch.size bytes, otherwise it will try to flush message as soon as possible to reduce latency.
 storm.messaging.netty.transfer.batch.size: 262144
-
+# Sets the backlog value to specify when the channel binds to a local address
+storm.messaging.netty.backlog: 500
 # We check with this interval that whether the Netty channel is writable and try to write pending messages if it is.
 storm.messaging.netty.flush.check.interval.ms: 10
 

http://git-wip-us.apache.org/repos/asf/storm/blob/d2349505/storm-core/src/jvm/backtype/storm/Config.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/Config.java b/storm-core/src/jvm/backtype/storm/Config.java
index 8407010..eb37bc8 100644
--- a/storm-core/src/jvm/backtype/storm/Config.java
+++ b/storm-core/src/jvm/backtype/storm/Config.java
@@ -53,6 +53,12 @@ public class Config extends HashMap<String, Object> {
      */
     public static final String STORM_MESSAGING_NETTY_BUFFER_SIZE = "storm.messaging.netty.buffer_size"; 
     public static final Object STORM_MESSAGING_NETTY_BUFFER_SIZE_SCHEMA = ConfigValidation.IntegerValidator;
+    
+    /**
+     * Netty based messaging: Sets the backlog value to specify when the channel binds to a local address
+     */
+    public static final String STORM_MESSAGING_NETTY_BACKLOG = "storm.messaging.netty.backlog"; 
+    public static final Object STORM_MESSAGING_NETTY_BACKLOG_SCHEMA = ConfigValidation.IntegerValidator;
 
     /**
      * Netty based messaging: The max # of retries that a peer will perform when a remote is not accessible

http://git-wip-us.apache.org/repos/asf/storm/blob/d2349505/storm-core/src/jvm/backtype/storm/messaging/netty/Server.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/messaging/netty/Server.java b/storm-core/src/jvm/backtype/storm/messaging/netty/Server.java
index 20a147d..47a721f 100644
--- a/storm-core/src/jvm/backtype/storm/messaging/netty/Server.java
+++ b/storm-core/src/jvm/backtype/storm/messaging/netty/Server.java
@@ -79,6 +79,7 @@ class Server implements IConnection {
         
         // Configure the server.
         int buffer_size = Utils.getInt(storm_conf.get(Config.STORM_MESSAGING_NETTY_BUFFER_SIZE));
+        int backlog = Utils.getInt(storm_conf.get(Config.STORM_MESSAGING_NETTY_BACKLOG), 500);
         int maxWorkers = Utils.getInt(storm_conf.get(Config.STORM_MESSAGING_NETTY_SERVER_WORKER_THREADS));
 
         ThreadFactory bossFactory = new NettyRenameThreadFactory(name() + "-boss");
@@ -98,6 +99,7 @@ class Server implements IConnection {
         bootstrap.setOption("child.tcpNoDelay", true);
         bootstrap.setOption("child.receiveBufferSize", buffer_size);
         bootstrap.setOption("child.keepAlive", true);
+        bootstrap.setOption("backlog", backlog);
 
         // Set up the pipeline factory.
         bootstrap.setPipelineFactory(new StormServerPipelineFactory(this));


[6/6] storm git commit: Added STORM-552 to Changelog and Readme

Posted by bo...@apache.org.
Added STORM-552 to Changelog and Readme


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

Branch: refs/heads/master
Commit: a1268f110774508d3271c5e584c2a08a55514e18
Parents: 0983da3
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Fri Jan 9 12:34:13 2015 -0600
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Fri Jan 9 12:34:13 2015 -0600

----------------------------------------------------------------------
 CHANGELOG.md    | 1 +
 README.markdown | 1 +
 2 files changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/a1268f11/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f15fc27..42db893 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -23,6 +23,7 @@
  * STORM-599: Use use nimbus's cached heartbeats rather than fetching again from ZK
  * STORM-410: Add groups support to log-viewer
  * STORM-444: Add AutoHDFS like credential fetching for HBase
+ * STORM-552: Add netty socket backlog config
 
 ## 0.9.3-rc2
  * STORM-558: change "swap!" to "reset!" to fix assignment-versions in supervisor

http://git-wip-us.apache.org/repos/asf/storm/blob/a1268f11/README.markdown
----------------------------------------------------------------------
diff --git a/README.markdown b/README.markdown
index 4ffd757..7f4f57d 100644
--- a/README.markdown
+++ b/README.markdown
@@ -181,6 +181,7 @@ under the License.
 * Kai Sasaki ([@Lewuathe](https://github.com/Lewuathe))
 * Matthew Siegel ([@msiegel07](https://github.com/msiegel07))
 * Jun Xia ([@tedxia](https://github.com/tedxia))
+* caofangkun ([@caofangkun](https://github.com/caofangkun))
 
 ## Acknowledgements
 


[2/6] storm git commit: Merge pull request #2 from apache/master

Posted by bo...@apache.org.
Merge pull request #2 from apache/master

Merge from trunk to caofangkun

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

Branch: refs/heads/master
Commit: 97ae36e42abc961fbcc54dd77c80bafff30dce7e
Parents: 96e8a5b 527eb29
Author: caofangkun <ca...@gmail.com>
Authored: Mon Dec 22 16:18:08 2014 +0800
Committer: caofangkun <ca...@gmail.com>
Committed: Mon Dec 22 16:18:08 2014 +0800

----------------------------------------------------------------------
 .gitignore                                      |    1 +
 CHANGELOG.md                                    |   11 +-
 README.markdown                                 |    2 +
 STORM-UI-REST-API.md                            |  186 +-
 conf/defaults.yaml                              |    1 +
 doap_Storm.rdf                                  |   57 +
 docs/README.md                                  |   38 +
 docs/_config.yml                                |   11 +
 docs/_includes/footer.html                      |   16 +
 docs/_includes/head.html                        |   31 +
 docs/_includes/header.html                      |   25 +
 docs/_layouts/about.html                        |   40 +
 docs/_layouts/default.html                      |   19 +
 docs/_layouts/documentation.html                |   16 +
 docs/_layouts/page.html                         |   14 +
 docs/_layouts/post.html                         |   15 +
 docs/_posts/2012-08-02-storm080-released.md     |  120 +
 docs/_posts/2012-09-06-storm081-released.md     |   47 +
 docs/_posts/2013-01-11-storm082-released.md     |   82 +
 docs/_posts/2013-12-08-storm090-released.md     |  127 +
 docs/_posts/2014-04-10-storm-logo-contest.md    |   66 +
 docs/_posts/2014-04-17-logo-pforrest.md         |   10 +
 docs/_posts/2014-04-17-logo-squinones.md        |    9 +
 docs/_posts/2014-04-19-logo-ssuleman.md         |    8 +
 docs/_posts/2014-04-21-logo-rmarshall.md        |   12 +
 docs/_posts/2014-04-22-logo-zsayari.md          |    9 +
 docs/_posts/2014-04-23-logo-abartos.md          |   15 +
 docs/_posts/2014-04-27-logo-cboustead.md        |   12 +
 docs/_posts/2014-04-27-logo-sasili.md           |   10 +
 docs/_posts/2014-04-29-logo-jlee1.md            |   10 +
 docs/_posts/2014-04-29-logo-jlee2.md            |   10 +
 docs/_posts/2014-04-29-logo-jlee3.md            |   10 +
 docs/_posts/2014-05-27-round1-results.md        |   38 +
 docs/_posts/2014-06-17-contest-results.md       |   24 +
 docs/_posts/2014-06-25-storm092-released.md     |  137 +
 .../2014-10-20-storm093-release-candidate.md    |   11 +
 docs/_posts/2014-11-25-storm093-released.md     |  164 +
 docs/_sass/_syntax-highlighting.scss            |   70 +
 docs/about.md                                   |    7 +
 docs/about/deployment.md                        |    9 +
 docs/about/fault-tolerant.md                    |    9 +
 docs/about/free-and-open-source.md              |   15 +
 docs/about/guarantees-data-processing.md        |   10 +
 docs/about/integrates.md                        |   13 +
 docs/about/multi-language.md                    |    9 +
 docs/about/scalable.md                          |   10 +
 docs/about/simple-api.md                        |   15 +
 docs/assets/css/bootstrap-theme.css             |  470 ++
 docs/assets/css/bootstrap-theme.css.map         |    1 +
 docs/assets/css/bootstrap-theme.min.css         |    5 +
 docs/assets/css/bootstrap.css                   | 6332 ++++++++++++++++++
 docs/assets/css/bootstrap.css.map               |    1 +
 docs/assets/css/bootstrap.min.css               |    5 +
 docs/assets/css/theme.css                       |   18 +
 docs/assets/favicon.ico                         |  Bin 0 -> 1150 bytes
 .../fonts/glyphicons-halflings-regular.eot      |  Bin 0 -> 20335 bytes
 .../fonts/glyphicons-halflings-regular.svg      |  229 +
 .../fonts/glyphicons-halflings-regular.ttf      |  Bin 0 -> 41280 bytes
 .../fonts/glyphicons-halflings-regular.woff     |  Bin 0 -> 23320 bytes
 docs/assets/js/bootstrap.js                     | 2320 +++++++
 docs/assets/js/bootstrap.min.js                 |    7 +
 docs/assets/js/npm.js                           |   13 +
 docs/css/main.scss                              |   47 +
 docs/doc-index.html                             |   11 +
 .../Acking-framework-implementation.md          |   38 +
 docs/documentation/Clojure-DSL.md               |  266 +
 docs/documentation/Command-line-client.md       |  102 +
 docs/documentation/Common-patterns.md           |   88 +
 docs/documentation/Concepts.md                  |  117 +
 docs/documentation/Configuration.md             |   31 +
 docs/documentation/Contributing-to-Storm.md     |   33 +
 .../Creating-a-new-Storm-project.md             |   27 +
 .../DSLs-and-multilang-adapters.md              |   11 +
 ...Defining-a-non-jvm-language-dsl-for-storm.md |   38 +
 docs/documentation/Distributed-RPC.md           |  199 +
 docs/documentation/Documentation.md             |   52 +
 docs/documentation/FAQ.md                       |  123 +
 docs/documentation/Fault-tolerance.md           |   30 +
 .../Guaranteeing-message-processing.md          |  181 +
 docs/documentation/Home.md                      |   69 +
 docs/documentation/Hooks.md                     |    9 +
 docs/documentation/Implementation-docs.md       |   20 +
 .../Installing-native-dependencies.md           |   38 +
 docs/documentation/Kestrel-and-Storm.md         |  200 +
 docs/documentation/Lifecycle-of-a-topology.md   |   82 +
 docs/documentation/Local-mode.md                |   29 +
 docs/documentation/Maven.md                     |   56 +
 .../Message-passing-implementation.md           |   30 +
 docs/documentation/Metrics.md                   |   36 +
 docs/documentation/Multilang-protocol.md        |  223 +
 docs/documentation/Powered-By.md                |  925 +++
 docs/documentation/Project-ideas.md             |    6 +
 docs/documentation/Rationale.md                 |   33 +
 ...unning-topologies-on-a-production-cluster.md |   77 +
 .../Serialization-(prior-to-0.6.0).md           |   52 +
 docs/documentation/Serialization.md             |   62 +
 docs/documentation/Serializers.md               |    4 +
 .../documentation/Setting-up-a-Storm-cluster.md |   85 +
 .../Setting-up-a-Storm-project-in-Eclipse.md    |    1 +
 .../Setting-up-development-environment.md       |   41 +
 docs/documentation/Spout-implementations.md     |   10 +
 ...guage-protocol-(versions-0.7.0-and-below).md |  124 +
 docs/documentation/Structure-of-the-codebase.md |  142 +
 .../Support-for-non-java-languages.md           |    9 +
 docs/documentation/Transactional-topologies.md  |  361 +
 docs/documentation/Trident-API-Overview.md      |  312 +
 docs/documentation/Trident-spouts.md            |   44 +
 docs/documentation/Trident-state.md             |  331 +
 docs/documentation/Trident-tutorial.md          |  254 +
 docs/documentation/Troubleshooting.md           |  145 +
 docs/documentation/Tutorial.md                  |  312 +
 ...nding-the-parallelism-of-a-Storm-topology.md |  123 +
 .../Using-non-JVM-languages-with-Storm.md       |   52 +
 docs/documentation/images/ack_tree.png          |  Bin 0 -> 31463 bytes
 docs/documentation/images/batched-stream.png    |  Bin 0 -> 66336 bytes
 docs/documentation/images/drpc-workflow.png     |  Bin 0 -> 66199 bytes
 .../images/eclipse-project-properties.png       |  Bin 0 -> 80810 bytes
 .../images/example-of-a-running-topology.png    |  Bin 0 -> 81430 bytes
 docs/documentation/images/grouping.png          |  Bin 0 -> 39701 bytes
 .../images/ld-library-path-eclipse-linux.png    |  Bin 0 -> 114597 bytes
 ...onships-worker-processes-executors-tasks.png |  Bin 0 -> 54804 bytes
 docs/documentation/images/spout-vs-state.png    |  Bin 0 -> 24804 bytes
 docs/documentation/images/storm-cluster.png     |  Bin 0 -> 34604 bytes
 docs/documentation/images/topology-tasks.png    |  Bin 0 -> 45960 bytes
 docs/documentation/images/topology.png          |  Bin 0 -> 23147 bytes
 .../images/transactional-batches.png            |  Bin 0 -> 23293 bytes
 .../images/transactional-commit-flow.png        |  Bin 0 -> 17725 bytes
 .../images/transactional-design-2.png           |  Bin 0 -> 13537 bytes
 .../images/transactional-spout-structure.png    |  Bin 0 -> 25067 bytes
 docs/documentation/images/trident-to-storm1.png |  Bin 0 -> 67173 bytes
 docs/documentation/images/trident-to-storm2.png |  Bin 0 -> 68943 bytes
 docs/documentation/images/tuple-dag.png         |  Bin 0 -> 18849 bytes
 docs/documentation/images/tuple_tree.png        |  Bin 0 -> 58186 bytes
 docs/downloads.html                             |  155 +
 docs/feed.xml                                   |   30 +
 docs/images/bullet.gif                          |  Bin 0 -> 82 bytes
 docs/images/download.png                        |  Bin 0 -> 16272 bytes
 docs/images/incubator-logo.png                  |  Bin 0 -> 11651 bytes
 .../logocontest/abartos/stationery_mockup.jpg   |  Bin 0 -> 146498 bytes
 docs/images/logocontest/abartos/storm_logo.png  |  Bin 0 -> 153974 bytes
 docs/images/logocontest/abartos/storm_logo2.png |  Bin 0 -> 115425 bytes
 docs/images/logocontest/abartos/storm_logo3.png |  Bin 0 -> 94950 bytes
 .../images/logocontest/cboustead/storm_logo.png |  Bin 0 -> 67149 bytes
 .../logocontest/cboustead/storm_logo1.png       |  Bin 0 -> 16327 bytes
 docs/images/logocontest/jlee1/storm_logo.jpg    |  Bin 0 -> 189382 bytes
 docs/images/logocontest/jlee2/storm_logo.jpg    |  Bin 0 -> 155666 bytes
 docs/images/logocontest/jlee3/storm_logo.jpg    |  Bin 0 -> 158134 bytes
 docs/images/logocontest/pforrest/storm1.png     |  Bin 0 -> 84569 bytes
 .../pforrest/storm_logo_composite.png           |  Bin 0 -> 139223 bytes
 .../rmarshall/StormLogo_Horizontal.png          |  Bin 0 -> 16481 bytes
 .../rmarshall/StormLogo_Horizontal_NoColour.png |  Bin 0 -> 14358 bytes
 .../logocontest/rmarshall/StormLogo_Square.png  |  Bin 0 -> 14392 bytes
 docs/images/logocontest/sasili/storm_logo.png   |  Bin 0 -> 92196 bytes
 .../images/logocontest/squinones/storm_logo.png |  Bin 0 -> 203263 bytes
 .../logocontest/squinones/storm_logo1.png       |  Bin 0 -> 53325 bytes
 docs/images/logocontest/ssuleman/storm_logo.png |  Bin 0 -> 95509 bytes
 docs/images/logocontest/storm_logo_winner.png   |  Bin 0 -> 34490 bytes
 docs/images/logocontest/zsayari/storm_logo.png  |  Bin 0 -> 120794 bytes
 docs/images/logos/8digits.png                   |  Bin 0 -> 19557 bytes
 docs/images/logos/Yahoo_Japan_logo.png          |  Bin 0 -> 3707 bytes
 docs/images/logos/aeris.png                     |  Bin 0 -> 6268 bytes
 docs/images/logos/alibaba.jpg                   |  Bin 0 -> 43703 bytes
 docs/images/logos/baidu.jpeg                    |  Bin 0 -> 3413 bytes
 docs/images/logos/cerner.gif                    |  Bin 0 -> 2591 bytes
 docs/images/logos/flipboard.jpeg                |  Bin 0 -> 2909 bytes
 docs/images/logos/fullcontact.png               |  Bin 0 -> 24567 bytes
 docs/images/logos/groupon.jpg                   |  Bin 0 -> 41413 bytes
 docs/images/logos/holidaycheck.png              |  Bin 0 -> 3129 bytes
 docs/images/logos/idexx.gif                     |  Bin 0 -> 38689 bytes
 docs/images/logos/mercadolibre.png              |  Bin 0 -> 73388 bytes
 docs/images/logos/navisite.jpg                  |  Bin 0 -> 9358 bytes
 docs/images/logos/ooyala.gif                    |  Bin 0 -> 7830 bytes
 docs/images/logos/parc.png                      |  Bin 0 -> 7256 bytes
 docs/images/logos/quicklizard.png               |  Bin 0 -> 5667 bytes
 docs/images/logos/rocketfuel.png                |  Bin 0 -> 9719 bytes
 docs/images/logos/rubicon.png                   |  Bin 0 -> 10663 bytes
 docs/images/logos/spiderio.png                  |  Bin 0 -> 46790 bytes
 docs/images/logos/spotify.jpeg                  |  Bin 0 -> 3282 bytes
 docs/images/logos/taobao.gif                    |  Bin 0 -> 3262 bytes
 docs/images/logos/twitter.png                   |  Bin 0 -> 4392 bytes
 docs/images/logos/weatherchannel.gif            |  Bin 0 -> 3425 bytes
 docs/images/logos/webmd.jpg                     |  Bin 0 -> 6193 bytes
 docs/images/logos/yelp.png                      |  Bin 0 -> 98431 bytes
 docs/images/mailinglist.png                     |  Bin 0 -> 4245 bytes
 docs/images/storm_header.png                    |  Bin 0 -> 17291 bytes
 docs/images/storm_logo_tagline_color copy.png   |  Bin 0 -> 67928 bytes
 docs/images/storm_logo_tagline_color.png        |  Bin 0 -> 33568 bytes
 docs/images/top_bg.gif                          |  Bin 0 -> 113 bytes
 docs/images/topology.png                        |  Bin 0 -> 59837 bytes
 docs/images/ui_topology_viz.png                 |  Bin 0 -> 112831 bytes
 docs/index.html                                 |  104 +
 docs/news.html                                  |   12 +
 .../multilang/resources/asyncSplitsentence.js   |   18 +
 .../multilang/resources/randomsentence.js       |   18 +
 .../multilang/resources/splitsentence.js        |   18 +
 .../storm-starter/multilang/resources/storm.js  |   18 +
 external/storm-hbase/pom.xml                    |    1 -
 .../trident/mapper/TridentHBaseMapper.java      |   18 +
 .../hbase/trident/state/HBaseMapState.java      |   17 +
 .../hdfs/bolt/format/DefaultSequenceFormat.java |   17 +
 .../storm/hdfs/bolt/format/SequenceFormat.java  |   17 +
 .../hdfs/bolt/rotation/TimedRotationPolicy.java |   17 +
 .../hdfs/common/rotation/MoveFileAction.java    |   17 +
 .../hdfs/common/rotation/RotationAction.java    |   17 +
 .../apache/storm/hdfs/trident/HdfsState.java    |   17 +
 .../storm/hdfs/trident/HdfsStateFactory.java    |   17 +
 .../apache/storm/hdfs/trident/HdfsUpdater.java  |   17 +
 .../trident/format/DefaultSequenceFormat.java   |   17 +
 .../hdfs/trident/format/SequenceFormat.java     |   17 +
 .../trident/rotation/TimedRotationPolicy.java   |   17 +
 .../storm/hdfs/trident/FixedBatchSpout.java     |   17 +
 .../storm/hdfs/trident/TridentFileTopology.java |   17 +
 .../hdfs/trident/TridentSequenceTopology.java   |   17 +
 external/storm-kafka/README.md                  |    6 +-
 .../jvm/storm/kafka/UpdateOffsetException.java  |   17 +
 logback/cluster.xml                             |    2 +-
 pom.xml                                         |   11 +-
 .../src/clj/backtype/storm/daemon/executor.clj  |    6 +-
 .../src/clj/backtype/storm/messaging/loader.clj |    3 +-
 storm-core/src/clj/backtype/storm/testing4j.clj |   23 +-
 storm-core/src/dev/resources/storm.js           |   18 +
 storm-core/src/dev/resources/tester_bolt.js     |   17 +
 storm-core/src/dev/resources/tester_spout.js    |   17 +
 storm-core/src/jvm/backtype/storm/Config.java   |   10 +
 .../auth/authorizer/SimpleACLAuthorizer.java    |    2 +-
 .../storm/testing/CompleteTopologyParam.java    |   22 +-
 .../storm/testing/PythonShellMetricsBolt.java   |   17 +
 .../storm/testing/PythonShellMetricsSpout.java  |   17 +
 .../storm/ui/InvalidRequestException.java       |   17 +
 storm-core/src/multilang/js/storm.js            |   19 +-
 storm-core/src/ui/public/component.html         |    2 +-
 storm-core/src/ui/public/favicon.ico            |  Bin 0 -> 18280 bytes
 232 files changed, 17455 insertions(+), 91 deletions(-)
----------------------------------------------------------------------



[3/6] storm git commit: Merge remote-tracking branch 'origin/master' into storm-552

Posted by bo...@apache.org.
Merge remote-tracking branch 'origin/master' into storm-552


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

Branch: refs/heads/master
Commit: 1482915a9c3022d63830dd541b5faabbef2622ca
Parents: d234950 97ae36e
Author: caofangkun <ca...@gmail.com>
Authored: Wed Dec 24 10:40:12 2014 +0800
Committer: caofangkun <ca...@gmail.com>
Committed: Wed Dec 24 10:40:12 2014 +0800

----------------------------------------------------------------------
 .gitignore                                      |    1 +
 CHANGELOG.md                                    |   26 +-
 DEVELOPER.md                                    |    4 +
 LICENSE                                         |   14 +-
 README.markdown                                 |    4 +
 SECURITY.md                                     |  356 +-
 STORM-UI-REST-API.md                            |  179 +-
 bin/storm                                       |   15 +-
 bin/storm.cmd                                   |   11 +-
 conf/defaults.yaml                              |   46 +-
 conf/jaas_digest.conf                           |    8 +-
 conf/jaas_kerberos.conf                         |   15 +
 doap_Storm.rdf                                  |   57 +
 docs/README.md                                  |   38 +
 docs/_config.yml                                |   11 +
 docs/_includes/footer.html                      |   16 +
 docs/_includes/head.html                        |   31 +
 docs/_includes/header.html                      |   25 +
 docs/_layouts/about.html                        |   40 +
 docs/_layouts/default.html                      |   19 +
 docs/_layouts/documentation.html                |   16 +
 docs/_layouts/page.html                         |   14 +
 docs/_layouts/post.html                         |   15 +
 docs/_posts/2012-08-02-storm080-released.md     |  120 +
 docs/_posts/2012-09-06-storm081-released.md     |   47 +
 docs/_posts/2013-01-11-storm082-released.md     |   82 +
 docs/_posts/2013-12-08-storm090-released.md     |  127 +
 docs/_posts/2014-04-10-storm-logo-contest.md    |   66 +
 docs/_posts/2014-04-17-logo-pforrest.md         |   10 +
 docs/_posts/2014-04-17-logo-squinones.md        |    9 +
 docs/_posts/2014-04-19-logo-ssuleman.md         |    8 +
 docs/_posts/2014-04-21-logo-rmarshall.md        |   12 +
 docs/_posts/2014-04-22-logo-zsayari.md          |    9 +
 docs/_posts/2014-04-23-logo-abartos.md          |   15 +
 docs/_posts/2014-04-27-logo-cboustead.md        |   12 +
 docs/_posts/2014-04-27-logo-sasili.md           |   10 +
 docs/_posts/2014-04-29-logo-jlee1.md            |   10 +
 docs/_posts/2014-04-29-logo-jlee2.md            |   10 +
 docs/_posts/2014-04-29-logo-jlee3.md            |   10 +
 docs/_posts/2014-05-27-round1-results.md        |   38 +
 docs/_posts/2014-06-17-contest-results.md       |   24 +
 docs/_posts/2014-06-25-storm092-released.md     |  137 +
 .../2014-10-20-storm093-release-candidate.md    |   11 +
 docs/_posts/2014-11-25-storm093-released.md     |  164 +
 docs/_sass/_syntax-highlighting.scss            |   70 +
 docs/about.md                                   |    7 +
 docs/about/deployment.md                        |    9 +
 docs/about/fault-tolerant.md                    |    9 +
 docs/about/free-and-open-source.md              |   15 +
 docs/about/guarantees-data-processing.md        |   10 +
 docs/about/integrates.md                        |   13 +
 docs/about/multi-language.md                    |    9 +
 docs/about/scalable.md                          |   10 +
 docs/about/simple-api.md                        |   15 +
 docs/assets/css/bootstrap-theme.css             |  470 ++
 docs/assets/css/bootstrap-theme.css.map         |    1 +
 docs/assets/css/bootstrap-theme.min.css         |    5 +
 docs/assets/css/bootstrap.css                   | 6332 ++++++++++++++++++
 docs/assets/css/bootstrap.css.map               |    1 +
 docs/assets/css/bootstrap.min.css               |    5 +
 docs/assets/css/theme.css                       |   18 +
 docs/assets/favicon.ico                         |  Bin 0 -> 1150 bytes
 .../fonts/glyphicons-halflings-regular.eot      |  Bin 0 -> 20335 bytes
 .../fonts/glyphicons-halflings-regular.svg      |  229 +
 .../fonts/glyphicons-halflings-regular.ttf      |  Bin 0 -> 41280 bytes
 .../fonts/glyphicons-halflings-regular.woff     |  Bin 0 -> 23320 bytes
 docs/assets/js/bootstrap.js                     | 2320 +++++++
 docs/assets/js/bootstrap.min.js                 |    7 +
 docs/assets/js/npm.js                           |   13 +
 docs/css/main.scss                              |   47 +
 docs/doc-index.html                             |   11 +
 .../Acking-framework-implementation.md          |   38 +
 docs/documentation/Clojure-DSL.md               |  266 +
 docs/documentation/Command-line-client.md       |  102 +
 docs/documentation/Common-patterns.md           |   88 +
 docs/documentation/Concepts.md                  |  117 +
 docs/documentation/Configuration.md             |   31 +
 docs/documentation/Contributing-to-Storm.md     |   33 +
 .../Creating-a-new-Storm-project.md             |   27 +
 .../DSLs-and-multilang-adapters.md              |   11 +
 ...Defining-a-non-jvm-language-dsl-for-storm.md |   38 +
 docs/documentation/Distributed-RPC.md           |  199 +
 docs/documentation/Documentation.md             |   52 +
 docs/documentation/FAQ.md                       |  123 +
 docs/documentation/Fault-tolerance.md           |   30 +
 .../Guaranteeing-message-processing.md          |  181 +
 docs/documentation/Home.md                      |   69 +
 docs/documentation/Hooks.md                     |    9 +
 docs/documentation/Implementation-docs.md       |   20 +
 .../Installing-native-dependencies.md           |   38 +
 docs/documentation/Kestrel-and-Storm.md         |  200 +
 docs/documentation/Lifecycle-of-a-topology.md   |   82 +
 docs/documentation/Local-mode.md                |   29 +
 docs/documentation/Maven.md                     |   56 +
 .../Message-passing-implementation.md           |   30 +
 docs/documentation/Metrics.md                   |   36 +
 docs/documentation/Multilang-protocol.md        |  223 +
 docs/documentation/Powered-By.md                |  925 +++
 docs/documentation/Project-ideas.md             |    6 +
 docs/documentation/Rationale.md                 |   33 +
 ...unning-topologies-on-a-production-cluster.md |   77 +
 .../Serialization-(prior-to-0.6.0).md           |   52 +
 docs/documentation/Serialization.md             |   62 +
 docs/documentation/Serializers.md               |    4 +
 .../documentation/Setting-up-a-Storm-cluster.md |   85 +
 .../Setting-up-a-Storm-project-in-Eclipse.md    |    1 +
 .../Setting-up-development-environment.md       |   41 +
 docs/documentation/Spout-implementations.md     |   10 +
 ...guage-protocol-(versions-0.7.0-and-below).md |  124 +
 docs/documentation/Structure-of-the-codebase.md |  142 +
 .../Support-for-non-java-languages.md           |    9 +
 docs/documentation/Transactional-topologies.md  |  361 +
 docs/documentation/Trident-API-Overview.md      |  312 +
 docs/documentation/Trident-spouts.md            |   44 +
 docs/documentation/Trident-state.md             |  331 +
 docs/documentation/Trident-tutorial.md          |  254 +
 docs/documentation/Troubleshooting.md           |  145 +
 docs/documentation/Tutorial.md                  |  312 +
 ...nding-the-parallelism-of-a-Storm-topology.md |  123 +
 .../Using-non-JVM-languages-with-Storm.md       |   52 +
 docs/documentation/images/ack_tree.png          |  Bin 0 -> 31463 bytes
 docs/documentation/images/batched-stream.png    |  Bin 0 -> 66336 bytes
 docs/documentation/images/drpc-workflow.png     |  Bin 0 -> 66199 bytes
 .../images/eclipse-project-properties.png       |  Bin 0 -> 80810 bytes
 .../images/example-of-a-running-topology.png    |  Bin 0 -> 81430 bytes
 docs/documentation/images/grouping.png          |  Bin 0 -> 39701 bytes
 .../images/ld-library-path-eclipse-linux.png    |  Bin 0 -> 114597 bytes
 ...onships-worker-processes-executors-tasks.png |  Bin 0 -> 54804 bytes
 docs/documentation/images/spout-vs-state.png    |  Bin 0 -> 24804 bytes
 docs/documentation/images/storm-cluster.png     |  Bin 0 -> 34604 bytes
 docs/documentation/images/topology-tasks.png    |  Bin 0 -> 45960 bytes
 docs/documentation/images/topology.png          |  Bin 0 -> 23147 bytes
 .../images/transactional-batches.png            |  Bin 0 -> 23293 bytes
 .../images/transactional-commit-flow.png        |  Bin 0 -> 17725 bytes
 .../images/transactional-design-2.png           |  Bin 0 -> 13537 bytes
 .../images/transactional-spout-structure.png    |  Bin 0 -> 25067 bytes
 docs/documentation/images/trident-to-storm1.png |  Bin 0 -> 67173 bytes
 docs/documentation/images/trident-to-storm2.png |  Bin 0 -> 68943 bytes
 docs/documentation/images/tuple-dag.png         |  Bin 0 -> 18849 bytes
 docs/documentation/images/tuple_tree.png        |  Bin 0 -> 58186 bytes
 docs/downloads.html                             |  155 +
 docs/feed.xml                                   |   30 +
 docs/images/bullet.gif                          |  Bin 0 -> 82 bytes
 docs/images/download.png                        |  Bin 0 -> 16272 bytes
 docs/images/incubator-logo.png                  |  Bin 0 -> 11651 bytes
 .../logocontest/abartos/stationery_mockup.jpg   |  Bin 0 -> 146498 bytes
 docs/images/logocontest/abartos/storm_logo.png  |  Bin 0 -> 153974 bytes
 docs/images/logocontest/abartos/storm_logo2.png |  Bin 0 -> 115425 bytes
 docs/images/logocontest/abartos/storm_logo3.png |  Bin 0 -> 94950 bytes
 .../images/logocontest/cboustead/storm_logo.png |  Bin 0 -> 67149 bytes
 .../logocontest/cboustead/storm_logo1.png       |  Bin 0 -> 16327 bytes
 docs/images/logocontest/jlee1/storm_logo.jpg    |  Bin 0 -> 189382 bytes
 docs/images/logocontest/jlee2/storm_logo.jpg    |  Bin 0 -> 155666 bytes
 docs/images/logocontest/jlee3/storm_logo.jpg    |  Bin 0 -> 158134 bytes
 docs/images/logocontest/pforrest/storm1.png     |  Bin 0 -> 84569 bytes
 .../pforrest/storm_logo_composite.png           |  Bin 0 -> 139223 bytes
 .../rmarshall/StormLogo_Horizontal.png          |  Bin 0 -> 16481 bytes
 .../rmarshall/StormLogo_Horizontal_NoColour.png |  Bin 0 -> 14358 bytes
 .../logocontest/rmarshall/StormLogo_Square.png  |  Bin 0 -> 14392 bytes
 docs/images/logocontest/sasili/storm_logo.png   |  Bin 0 -> 92196 bytes
 .../images/logocontest/squinones/storm_logo.png |  Bin 0 -> 203263 bytes
 .../logocontest/squinones/storm_logo1.png       |  Bin 0 -> 53325 bytes
 docs/images/logocontest/ssuleman/storm_logo.png |  Bin 0 -> 95509 bytes
 docs/images/logocontest/storm_logo_winner.png   |  Bin 0 -> 34490 bytes
 docs/images/logocontest/zsayari/storm_logo.png  |  Bin 0 -> 120794 bytes
 docs/images/logos/8digits.png                   |  Bin 0 -> 19557 bytes
 docs/images/logos/Yahoo_Japan_logo.png          |  Bin 0 -> 3707 bytes
 docs/images/logos/aeris.png                     |  Bin 0 -> 6268 bytes
 docs/images/logos/alibaba.jpg                   |  Bin 0 -> 43703 bytes
 docs/images/logos/baidu.jpeg                    |  Bin 0 -> 3413 bytes
 docs/images/logos/cerner.gif                    |  Bin 0 -> 2591 bytes
 docs/images/logos/flipboard.jpeg                |  Bin 0 -> 2909 bytes
 docs/images/logos/fullcontact.png               |  Bin 0 -> 24567 bytes
 docs/images/logos/groupon.jpg                   |  Bin 0 -> 41413 bytes
 docs/images/logos/holidaycheck.png              |  Bin 0 -> 3129 bytes
 docs/images/logos/idexx.gif                     |  Bin 0 -> 38689 bytes
 docs/images/logos/mercadolibre.png              |  Bin 0 -> 73388 bytes
 docs/images/logos/navisite.jpg                  |  Bin 0 -> 9358 bytes
 docs/images/logos/ooyala.gif                    |  Bin 0 -> 7830 bytes
 docs/images/logos/parc.png                      |  Bin 0 -> 7256 bytes
 docs/images/logos/quicklizard.png               |  Bin 0 -> 5667 bytes
 docs/images/logos/rocketfuel.png                |  Bin 0 -> 9719 bytes
 docs/images/logos/rubicon.png                   |  Bin 0 -> 10663 bytes
 docs/images/logos/spiderio.png                  |  Bin 0 -> 46790 bytes
 docs/images/logos/spotify.jpeg                  |  Bin 0 -> 3282 bytes
 docs/images/logos/taobao.gif                    |  Bin 0 -> 3262 bytes
 docs/images/logos/twitter.png                   |  Bin 0 -> 4392 bytes
 docs/images/logos/weatherchannel.gif            |  Bin 0 -> 3425 bytes
 docs/images/logos/webmd.jpg                     |  Bin 0 -> 6193 bytes
 docs/images/logos/yelp.png                      |  Bin 0 -> 98431 bytes
 docs/images/mailinglist.png                     |  Bin 0 -> 4245 bytes
 docs/images/storm_header.png                    |  Bin 0 -> 17291 bytes
 docs/images/storm_logo_tagline_color copy.png   |  Bin 0 -> 67928 bytes
 docs/images/storm_logo_tagline_color.png        |  Bin 0 -> 33568 bytes
 docs/images/top_bg.gif                          |  Bin 0 -> 113 bytes
 docs/images/topology.png                        |  Bin 0 -> 59837 bytes
 docs/images/ui_topology_viz.png                 |  Bin 0 -> 112831 bytes
 docs/index.html                                 |  104 +
 docs/news.html                                  |   12 +
 .../multilang/resources/asyncSplitsentence.js   |   18 +
 .../multilang/resources/randomsentence.js       |   18 +
 .../multilang/resources/splitsentence.js        |   18 +
 .../storm-starter/multilang/resources/storm.js  |   38 +-
 .../storm-starter/multilang/resources/storm.py  |   87 +-
 .../storm-starter/multilang/resources/storm.rb  |   90 +-
 examples/storm-starter/pom.xml                  |    2 +-
 .../src/jvm/storm/starter/util/StormRunner.java |    3 +-
 external/storm-hbase/pom.xml                    |    5 +-
 .../trident/mapper/TridentHBaseMapper.java      |   18 +
 .../hbase/trident/state/HBaseMapState.java      |   17 +
 external/storm-hdfs/pom.xml                     |    4 +-
 .../hdfs/bolt/format/DefaultSequenceFormat.java |   17 +
 .../storm/hdfs/bolt/format/SequenceFormat.java  |   17 +
 .../hdfs/bolt/rotation/TimedRotationPolicy.java |   17 +
 .../hdfs/common/rotation/MoveFileAction.java    |   17 +
 .../hdfs/common/rotation/RotationAction.java    |   17 +
 .../apache/storm/hdfs/trident/HdfsState.java    |   17 +
 .../storm/hdfs/trident/HdfsStateFactory.java    |   17 +
 .../apache/storm/hdfs/trident/HdfsUpdater.java  |   17 +
 .../trident/format/DefaultSequenceFormat.java   |   17 +
 .../hdfs/trident/format/SequenceFormat.java     |   17 +
 .../trident/rotation/TimedRotationPolicy.java   |   17 +
 .../storm/hdfs/trident/FixedBatchSpout.java     |   17 +
 .../storm/hdfs/trident/TridentFileTopology.java |   17 +
 .../hdfs/trident/TridentSequenceTopology.java   |   17 +
 external/storm-kafka/README.md                  |   13 +-
 external/storm-kafka/pom.xml                    |    2 +-
 .../src/jvm/storm/kafka/KafkaUtils.java         |   63 +-
 .../src/jvm/storm/kafka/PartitionManager.java   |   11 +-
 .../jvm/storm/kafka/UpdateOffsetException.java  |   22 +
 .../src/test/storm/kafka/KafkaUtilsTest.java    |    7 +-
 logback/cluster.xml                             |    6 +-
 logback/worker.xml                              |   41 +
 pom.xml                                         |   50 +-
 .../maven-shade-clojure-transformer/pom.xml     |    4 +-
 storm-core/pom.xml                              |  307 +-
 .../src/clj/backtype/storm/LocalCluster.clj     |    4 +
 storm-core/src/clj/backtype/storm/LocalDRPC.clj |    4 +-
 .../src/clj/backtype/storm/MockAutoCred.clj     |   58 +
 storm-core/src/clj/backtype/storm/bootstrap.clj |    5 +-
 storm-core/src/clj/backtype/storm/cluster.clj   |  167 +-
 .../storm/command/upload_credentials.clj        |   35 +
 storm-core/src/clj/backtype/storm/config.clj    |   40 +-
 .../backtype/storm/daemon/builtin_metrics.clj   |   21 +-
 .../src/clj/backtype/storm/daemon/common.clj    |   18 +-
 .../src/clj/backtype/storm/daemon/drpc.clj      |  174 +-
 .../src/clj/backtype/storm/daemon/executor.clj  |  139 +-
 .../src/clj/backtype/storm/daemon/logviewer.clj |  271 +-
 .../src/clj/backtype/storm/daemon/nimbus.clj    |  245 +-
 .../clj/backtype/storm/daemon/supervisor.clj    |  185 +-
 .../src/clj/backtype/storm/daemon/task.clj      |    7 +-
 .../src/clj/backtype/storm/daemon/worker.clj    |  109 +-
 storm-core/src/clj/backtype/storm/disruptor.clj |   11 +-
 .../src/clj/backtype/storm/messaging/loader.clj |   16 +-
 storm-core/src/clj/backtype/storm/testing.clj   |   56 +-
 storm-core/src/clj/backtype/storm/testing4j.clj |   28 +-
 storm-core/src/clj/backtype/storm/thrift.clj    |   28 +-
 storm-core/src/clj/backtype/storm/ui/core.clj   |  173 +-
 .../src/clj/backtype/storm/ui/helpers.clj       |   69 +-
 storm-core/src/clj/backtype/storm/util.clj      |   95 +-
 storm-core/src/clj/backtype/storm/zookeeper.clj |   19 +-
 storm-core/src/clj/storm/trident/testing.clj    |    1 +
 .../src/dev/drpc-simple-acl-test-scenario.yaml  |   11 +
 storm-core/src/dev/resources/storm.js           |   24 +
 storm-core/src/dev/resources/storm.py           |   25 +-
 storm-core/src/dev/resources/storm.rb           |   55 +-
 storm-core/src/dev/resources/tester_bolt.js     |   17 +
 storm-core/src/dev/resources/tester_spout.js    |   17 +
 storm-core/src/jvm/backtype/storm/Config.java   |  547 +-
 .../jvm/backtype/storm/ConfigValidation.java    |  156 +-
 .../src/jvm/backtype/storm/Constants.java       |    3 +-
 .../backtype/storm/ICredentialsListener.java    |   32 +
 .../src/jvm/backtype/storm/ILocalCluster.java   |    2 +
 .../src/jvm/backtype/storm/StormSubmitter.java  |  164 +-
 .../storm/drpc/DRPCInvocationsClient.java       |   91 +-
 .../src/jvm/backtype/storm/drpc/DRPCSpout.java  |  100 +-
 .../jvm/backtype/storm/drpc/ReturnResults.java  |   35 +-
 .../storm/generated/AuthorizationException.java |  345 +
 .../backtype/storm/generated/Credentials.java   |  390 ++
 .../storm/generated/DistributedRPC.java         |  110 +-
 .../generated/DistributedRPCInvocations.java    |  352 +-
 .../jvm/backtype/storm/generated/Nimbus.java    | 3006 ++++++++-
 .../backtype/storm/generated/SubmitOptions.java |   98 +-
 .../backtype/storm/generated/TopologyInfo.java  |  192 +-
 .../storm/generated/TopologySummary.java        |  192 +-
 .../backtype/storm/messaging/netty/Client.java  |   73 +-
 .../storm/messaging/netty/ControlMessage.java   |    4 +-
 .../storm/messaging/netty/MessageDecoder.java   |   32 +-
 .../storm/messaging/netty/MessageEncoder.java   |    4 +
 .../storm/messaging/netty/SaslMessageToken.java |   99 +
 .../storm/messaging/netty/SaslNettyClient.java  |  166 +
 .../messaging/netty/SaslNettyClientState.java   |   31 +
 .../storm/messaging/netty/SaslNettyServer.java  |  165 +
 .../messaging/netty/SaslNettyServerState.java   |   31 +
 .../messaging/netty/SaslStormClientHandler.java |  158 +
 .../netty/SaslStormServerAuthorizeHandler.java  |   83 +
 .../messaging/netty/SaslStormServerHandler.java |  155 +
 .../storm/messaging/netty/SaslUtils.java        |   74 +
 .../backtype/storm/messaging/netty/Server.java  |  104 +-
 .../netty/StormClientPipelineFactory.java       |   12 +-
 .../messaging/netty/StormServerHandler.java     |    2 +-
 .../netty/StormServerPipelineFactory.java       |   20 +-
 .../jvm/backtype/storm/scheduler/Cluster.java   |   13 +
 .../scheduler/multitenant/DefaultPool.java      |  219 +
 .../storm/scheduler/multitenant/FreePool.java   |  125 +
 .../scheduler/multitenant/IsolatedPool.java     |  346 +
 .../multitenant/MultitenantScheduler.java       |   98 +
 .../storm/scheduler/multitenant/Node.java       |  343 +
 .../storm/scheduler/multitenant/NodePool.java   |  296 +
 .../storm/security/INimbusCredentialPlugin.java |   47 +
 .../backtype/storm/security/auth/AuthUtils.java |  228 +-
 .../auth/DefaultHttpCredentialsPlugin.java      |   87 +
 .../security/auth/DefaultPrincipalToLocal.java  |   43 +
 .../storm/security/auth/IAutoCredentials.java   |   55 +
 .../security/auth/ICredentialsRenewer.java      |   41 +
 .../auth/IGroupMappingServiceProvider.java      |   42 +
 .../security/auth/IHttpCredentialsPlugin.java   |   50 +
 .../storm/security/auth/IPrincipalToLocal.java  |   41 +
 .../storm/security/auth/ITransportPlugin.java   |   14 +-
 .../security/auth/KerberosPrincipalToLocal.java |   45 +
 .../storm/security/auth/ReqContext.java         |   10 +-
 .../security/auth/SaslTransportPlugin.java      |   44 +-
 .../security/auth/ShellBasedGroupsMapping.java  |   94 +
 .../security/auth/SimpleTransportPlugin.java    |   61 +-
 .../security/auth/SingleUserPrincipal.java      |   56 +
 .../storm/security/auth/TBackoffConnect.java    |   77 +
 .../storm/security/auth/ThriftClient.java       |   85 +-
 .../security/auth/ThriftConnectionType.java     |   77 +
 .../storm/security/auth/ThriftServer.java       |   19 +-
 .../auth/authorizer/DRPCAuthorizerBase.java     |   46 +
 .../authorizer/DRPCSimpleACLAuthorizer.java     |  157 +
 .../auth/authorizer/DenyAuthorizer.java         |    4 +-
 .../auth/authorizer/NoopAuthorizer.java         |    6 +-
 .../auth/authorizer/SimpleACLAuthorizer.java    |  131 +
 .../authorizer/SimpleWhitelistAuthorizer.java   |   70 +
 .../auth/digest/DigestSaslTransportPlugin.java  |    1 +
 .../storm/security/auth/hadoop/AutoHDFS.java    |  262 +
 .../storm/security/auth/kerberos/AutoTGT.java   |  281 +
 .../auth/kerberos/AutoTGTKrb5LoginModule.java   |  108 +
 .../kerberos/AutoTGTKrb5LoginModuleTest.java    |   44 +
 .../auth/kerberos/ClientCallbackHandler.java    |  104 +
 .../kerberos/KerberosSaslTransportPlugin.java   |  206 +
 .../auth/kerberos/ServerCallbackHandler.java    |   86 +
 .../auth/kerberos/jaas_kerberos_cluster.conf    |   31 +
 .../auth/kerberos/jaas_kerberos_launcher.conf   |   12 +
 .../jvm/backtype/storm/spout/ShellSpout.java    |   65 +-
 .../src/jvm/backtype/storm/task/ShellBolt.java  |  211 +-
 .../storm/testing/CompleteTopologyParam.java    |   22 +-
 .../testing/ForwardingMetricsConsumer.java      |   95 +
 .../storm/testing/PythonShellMetricsBolt.java   |   17 +
 .../storm/testing/PythonShellMetricsSpout.java  |   17 +
 .../testing/SingleUserSimpleTransport.java      |   37 +
 .../state/TestTransactionalState.java           |   47 +
 .../transactional/state/TransactionalState.java |   56 +-
 .../storm/ui/InvalidRequestException.java       |   17 +
 .../jvm/backtype/storm/utils/DRPCClient.java    |   63 +-
 .../backtype/storm/utils/DisruptorQueue.java    |   56 +-
 .../jvm/backtype/storm/utils/LocalState.java    |   44 +-
 .../jvm/backtype/storm/utils/NimbusClient.java  |   11 +-
 .../jvm/backtype/storm/utils/ShellUtils.java    |  498 ++
 .../src/jvm/backtype/storm/utils/TestUtils.java |   34 +
 .../src/jvm/backtype/storm/utils/Utils.java     |  130 +-
 .../backtype/storm/utils/ZookeeperAuthInfo.java |    9 +-
 .../storm/utils/ZookeeperServerCnxnFactory.java |   84 +
 .../trident/drpc/ReturnResultsReducer.java      |   13 +-
 .../topology/state/TestTransactionalState.java  |   47 +
 .../topology/state/TransactionalState.java      |   58 +-
 storm-core/src/multilang/js/storm.js            |   19 +-
 storm-core/src/multilang/py/storm.py            |   25 +-
 storm-core/src/multilang/rb/storm.rb            |   55 +-
 .../src/native/worker-launcher/.autom4te.cfg    |   42 +
 .../worker-launcher/.deps/worker-launcher.Po    |    1 +
 .../src/native/worker-launcher/Makefile.am      |   32 +
 .../src/native/worker-launcher/configure.ac     |   50 +
 .../native/worker-launcher/impl/configuration.c |  340 +
 .../native/worker-launcher/impl/configuration.h |   45 +
 .../src/native/worker-launcher/impl/main.c      |  210 +
 .../worker-launcher/impl/worker-launcher.c      |  779 +++
 .../worker-launcher/impl/worker-launcher.h      |  129 +
 .../worker-launcher/test/test-worker-launcher.c |  340 +
 storm-core/src/py/__init__.py                   |   16 +
 storm-core/src/py/storm/DistributedRPC-remote   |   18 +
 storm-core/src/py/storm/DistributedRPC.py       |   37 +-
 .../py/storm/DistributedRPCInvocations-remote   |   18 +
 .../src/py/storm/DistributedRPCInvocations.py   |   96 +-
 storm-core/src/py/storm/Nimbus-remote           |   25 +
 storm-core/src/py/storm/Nimbus.py               |  652 +-
 storm-core/src/py/storm/__init__.py             |   16 +
 storm-core/src/py/storm/constants.py            |   16 +
 storm-core/src/py/storm/ttypes.py               | 1243 +++-
 storm-core/src/storm.thrift                     |   58 +-
 storm-core/src/ui/public/component.html         |   23 +-
 storm-core/src/ui/public/css/style.css          |    9 +
 storm-core/src/ui/public/favicon.ico            |  Bin 0 -> 18280 bytes
 storm-core/src/ui/public/index.html             |   12 +-
 storm-core/src/ui/public/js/script.js           |    3 +-
 .../public/templates/anti-forgery-template.html |   19 +
 .../public/templates/index-page-template.html   |   12 +
 .../templates/topology-page-template.html       |   23 +-
 .../src/ui/public/templates/user-template.html  |   25 +
 storm-core/src/ui/public/topology.html          |   21 +-
 .../test/clj/backtype/storm/cluster_test.clj    |   93 +-
 .../test/clj/backtype/storm/config_test.clj     |   11 +
 .../test/clj/backtype/storm/drpc_test.clj       |   14 +-
 .../clj/backtype/storm/local_state_test.clj     |   14 +-
 .../test/clj/backtype/storm/logviewer_test.clj  |  187 +
 .../storm/messaging/netty_integration_test.clj  |    4 +-
 .../storm/messaging/netty_unit_test.clj         |   32 +-
 .../test/clj/backtype/storm/nimbus_test.clj     |  377 +-
 .../scheduler/multitenant_scheduler_test.clj    |  831 +++
 .../storm/security/auth/AuthUtils_test.clj      |   16 +-
 .../auth/DefaultHttpCredentialsPlugin_test.clj  |   40 +
 .../storm/security/auth/ThriftClient_test.clj   |   28 +-
 .../storm/security/auth/ThriftServer_test.clj   |    8 +-
 .../backtype/storm/security/auth/auth_test.clj  |  374 +-
 .../authorizer/DRPCSimpleACLAuthorizer_test.clj |  226 +
 .../security/auth/auto_login_module_test.clj    |   91 +
 .../storm/security/auth/drpc-auth-alice.jaas    |    5 +
 .../storm/security/auth/drpc-auth-bob.jaas      |    5 +
 .../storm/security/auth/drpc-auth-charlie.jaas  |    5 +
 .../storm/security/auth/drpc-auth-server.jaas   |    6 +
 .../storm/security/auth/drpc_auth_test.clj      |  315 +
 .../storm/security/auth/nimbus_auth_test.clj    |  181 +
 .../test/clj/backtype/storm/submitter_test.clj  |   75 +
 .../test/clj/backtype/storm/supervisor_test.clj |  180 +-
 .../test/clj/backtype/storm/testing4j_test.clj  |   32 +
 .../clj/backtype/storm/transactional_test.clj   |   27 +-
 .../utils/ZookeeperServerCnxnFactory_test.clj   |   35 +
 .../test/clj/backtype/storm/utils_test.clj      |   58 +-
 .../test/clj/storm/trident/state_test.clj       |   25 +-
 .../storm/utils/DisruptorQueueTest.java         |   25 +-
 storm-dist/binary/LICENSE                       |   15 +-
 storm-dist/binary/pom.xml                       |    2 +-
 storm-dist/binary/src/main/assembly/binary.xml  |    4 +
 storm-dist/source/pom.xml                       |    2 +-
 435 files changed, 39558 insertions(+), 1719 deletions(-)
----------------------------------------------------------------------


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

http://git-wip-us.apache.org/repos/asf/storm/blob/1482915a/storm-core/src/jvm/backtype/storm/Config.java
----------------------------------------------------------------------
diff --cc storm-core/src/jvm/backtype/storm/Config.java
index eb37bc8,c680354..5a0157c
--- a/storm-core/src/jvm/backtype/storm/Config.java
+++ b/storm-core/src/jvm/backtype/storm/Config.java
@@@ -51,14 -58,8 +58,14 @@@ public class Config extends HashMap<Str
      /**
       * Netty based messaging: The buffer size for send/recv buffer
       */
-     public static final String STORM_MESSAGING_NETTY_BUFFER_SIZE = "storm.messaging.netty.buffer_size"; 
+     public static final String STORM_MESSAGING_NETTY_BUFFER_SIZE = "storm.messaging.netty.buffer_size";
      public static final Object STORM_MESSAGING_NETTY_BUFFER_SIZE_SCHEMA = ConfigValidation.IntegerValidator;
 +    
 +    /**
 +     * Netty based messaging: Sets the backlog value to specify when the channel binds to a local address
 +     */
 +    public static final String STORM_MESSAGING_NETTY_BACKLOG = "storm.messaging.netty.backlog"; 
 +    public static final Object STORM_MESSAGING_NETTY_BACKLOG_SCHEMA = ConfigValidation.IntegerValidator;
  
      /**
       * Netty based messaging: The max # of retries that a peer will perform when a remote is not accessible

http://git-wip-us.apache.org/repos/asf/storm/blob/1482915a/storm-core/src/jvm/backtype/storm/messaging/netty/Server.java
----------------------------------------------------------------------


[5/6] storm git commit: Merge branch 'storm-552' of http://github.com/caofangkun/apache-storm into STORM-552

Posted by bo...@apache.org.
Merge branch 'storm-552' of http://github.com/caofangkun/apache-storm into STORM-552

STORM-552: Add netty socket backlog config


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

Branch: refs/heads/master
Commit: 0983da334bd9c9c80214658ed0769b45a6a1351f
Parents: e71e2a3 93cf2c1
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Fri Jan 9 12:32:15 2015 -0600
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Fri Jan 9 12:32:15 2015 -0600

----------------------------------------------------------------------
 conf/defaults.yaml                                            | 3 ++-
 storm-core/src/jvm/backtype/storm/Config.java                 | 6 ++++++
 storm-core/src/jvm/backtype/storm/messaging/netty/Server.java | 2 ++
 3 files changed, 10 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


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

http://git-wip-us.apache.org/repos/asf/storm/blob/0983da33/storm-core/src/jvm/backtype/storm/Config.java
----------------------------------------------------------------------


[4/6] storm git commit: STORM-552:rename storm.messaging.netty.backlog to storm.messaging.netty.socket.backlog

Posted by bo...@apache.org.
STORM-552:rename storm.messaging.netty.backlog to storm.messaging.netty.socket.backlog


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

Branch: refs/heads/master
Commit: 93cf2c1d81a475bcb156a3ab8f519e8830c7d1f7
Parents: 1482915
Author: caofangkun <ca...@gmail.com>
Authored: Wed Dec 24 10:46:08 2014 +0800
Committer: caofangkun <ca...@gmail.com>
Committed: Wed Dec 24 10:46:08 2014 +0800

----------------------------------------------------------------------
 conf/defaults.yaml                                            | 2 +-
 storm-core/src/jvm/backtype/storm/Config.java                 | 4 ++--
 storm-core/src/jvm/backtype/storm/messaging/netty/Server.java | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/93cf2c1d/conf/defaults.yaml
----------------------------------------------------------------------
diff --git a/conf/defaults.yaml b/conf/defaults.yaml
index 5e40c3c..eb8e029 100644
--- a/conf/defaults.yaml
+++ b/conf/defaults.yaml
@@ -153,7 +153,7 @@ storm.messaging.netty.min_wait_ms: 100
 # If the Netty messaging layer is busy(netty internal buffer not writable), the Netty client will try to batch message as more as possible up to the size of storm.messaging.netty.transfer.batch.size bytes, otherwise it will try to flush message as soon as possible to reduce latency.
 storm.messaging.netty.transfer.batch.size: 262144
 # Sets the backlog value to specify when the channel binds to a local address
-storm.messaging.netty.backlog: 500
+storm.messaging.netty.socket.backlog: 500
 # We check with this interval that whether the Netty channel is writable and try to write pending messages if it is.
 storm.messaging.netty.flush.check.interval.ms: 10
 

http://git-wip-us.apache.org/repos/asf/storm/blob/93cf2c1d/storm-core/src/jvm/backtype/storm/Config.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/Config.java b/storm-core/src/jvm/backtype/storm/Config.java
index 5a0157c..5cc1f9c 100644
--- a/storm-core/src/jvm/backtype/storm/Config.java
+++ b/storm-core/src/jvm/backtype/storm/Config.java
@@ -64,8 +64,8 @@ public class Config extends HashMap<String, Object> {
     /**
      * Netty based messaging: Sets the backlog value to specify when the channel binds to a local address
      */
-    public static final String STORM_MESSAGING_NETTY_BACKLOG = "storm.messaging.netty.backlog"; 
-    public static final Object STORM_MESSAGING_NETTY_BACKLOG_SCHEMA = ConfigValidation.IntegerValidator;
+    public static final String STORM_MESSAGING_NETTY_SOCKET_BACKLOG = "storm.messaging.netty.socket.backlog"; 
+    public static final Object STORM_MESSAGING_NETTY_SOCKET_BACKLOG_SCHEMA = ConfigValidation.IntegerValidator;
 
     /**
      * Netty based messaging: The max # of retries that a peer will perform when a remote is not accessible

http://git-wip-us.apache.org/repos/asf/storm/blob/93cf2c1d/storm-core/src/jvm/backtype/storm/messaging/netty/Server.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/messaging/netty/Server.java b/storm-core/src/jvm/backtype/storm/messaging/netty/Server.java
index 592f53a..d1f10e1 100644
--- a/storm-core/src/jvm/backtype/storm/messaging/netty/Server.java
+++ b/storm-core/src/jvm/backtype/storm/messaging/netty/Server.java
@@ -89,7 +89,7 @@ class Server implements IConnection, IStatefulObject {
         
         // Configure the server.
         int buffer_size = Utils.getInt(storm_conf.get(Config.STORM_MESSAGING_NETTY_BUFFER_SIZE));
-        int backlog = Utils.getInt(storm_conf.get(Config.STORM_MESSAGING_NETTY_BACKLOG), 500);
+        int backlog = Utils.getInt(storm_conf.get(Config.STORM_MESSAGING_NETTY_SOCKET_BACKLOG), 500);
         int maxWorkers = Utils.getInt(storm_conf.get(Config.STORM_MESSAGING_NETTY_SERVER_WORKER_THREADS));
 
         ThreadFactory bossFactory = new NettyRenameThreadFactory(name() + "-boss");