storm-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bo...@apache.org
Subject [05/50] storm git commit: Merge remote-tracking branch 'upstream/security' into security
Date Thu, 13 Nov 2014 19:37:00 GMT
Merge remote-tracking branch 'upstream/security' into security

Conflicts:
	conf/defaults.yaml
	storm-core/src/jvm/backtype/storm/Config.java


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

Branch: refs/heads/master
Commit: 02e79499fa381b56f8a5333e00cf0cc0bd7aa252
Parents: 19ad135 559c883
Author: Raghavendra Nandagopal <speaktoraghav@gmail.com>
Authored: Tue Jul 29 16:37:50 2014 -0700
Committer: Raghavendra Nandagopal <speaktoraghav@gmail.com>
Committed: Tue Jul 29 16:37:50 2014 -0700

----------------------------------------------------------------------
 BYLAWS.md                                       |  96 ++++
 CHANGELOG.md                                    |  31 +
 LICENSE                                         |  30 +-
 README.markdown                                 |  14 +
 STORM-UI-REST-API.md                            | 567 +++++++++++++++++++
 bin/storm                                       |  77 ++-
 conf/defaults.yaml                              |  11 +-
 conf/storm_env.ini                              |   2 +-
 dev-tools/github/__init__.py                    | 109 ++++
 dev-tools/jira-github-join.py                   |  80 +++
 dev-tools/jira/__init__.py                      | 232 ++++++++
 examples/storm-starter/README.markdown          |  30 +-
 .../storm-starter/multilang/resources/storm.py  |   2 +-
 .../src/jvm/storm/starter/RollingTopWords.java  |  62 +-
 .../src/jvm/storm/starter/util/StormRunner.java |   9 +
 .../storm-kafka/src/jvm/storm/kafka/Broker.java |   9 +-
 .../src/jvm/storm/kafka/KafkaConfig.java        |   2 +-
 .../src/jvm/storm/kafka/Partition.java          |   9 +-
 pom.xml                                         |   6 +-
 .../src/clj/backtype/storm/LocalCluster.clj     |   7 +-
 storm-core/src/clj/backtype/storm/cluster.clj   |  31 +-
 .../src/clj/backtype/storm/command/monitor.clj  |  37 ++
 .../src/clj/backtype/storm/daemon/common.clj    |   2 +-
 .../src/clj/backtype/storm/daemon/drpc.clj      |   6 +-
 .../src/clj/backtype/storm/daemon/executor.clj  |   4 +-
 .../src/clj/backtype/storm/daemon/nimbus.clj    |   7 +-
 .../clj/backtype/storm/daemon/supervisor.clj    | 104 +++-
 .../src/clj/backtype/storm/daemon/worker.clj    |  72 +--
 storm-core/src/clj/backtype/storm/disruptor.clj |   2 +-
 storm-core/src/clj/backtype/storm/event.clj     |   2 +-
 storm-core/src/clj/backtype/storm/testing.clj   |  49 +-
 storm-core/src/clj/backtype/storm/ui/core.clj   |   2 +-
 .../src/clj/backtype/storm/ui/helpers.clj       |   5 -
 storm-core/src/clj/backtype/storm/util.clj      |  52 +-
 storm-core/src/clj/backtype/storm/zookeeper.clj |  25 +
 .../src/dev/resources/tester_bolt_metrics.py    |  35 ++
 .../src/dev/resources/tester_spout_metrics.py   |  51 ++
 storm-core/src/jvm/backtype/storm/Config.java   | 306 +++++-----
 .../jvm/backtype/storm/ConfigValidation.java    |  70 +++
 .../backtype/storm/messaging/netty/Client.java  |  13 +-
 .../metric/api/rpc/AssignableShellMetric.java   |  30 +
 .../metric/api/rpc/CombinedShellMetric.java     |  31 +
 .../storm/metric/api/rpc/CountShellMetric.java  |  38 ++
 .../storm/metric/api/rpc/IShellMetric.java      |  31 +
 .../metric/api/rpc/ReducedShellMetric.java      |  32 ++
 .../storm/multilang/JsonSerializer.java         |  15 +
 .../jvm/backtype/storm/multilang/ShellMsg.java  |  46 ++
 .../backtype/storm/security/auth/AuthUtils.java |  49 +-
 .../auth/IGroupMappingServiceProvider.java      |  42 ++
 .../security/auth/ShellBasedGroupsMapping.java  |  94 +++
 .../auth/authorizer/SimpleACLAuthorizer.java    |  29 +-
 .../src/jvm/backtype/storm/spout/ISpout.java    |   2 +-
 .../jvm/backtype/storm/spout/ShellSpout.java    |  72 ++-
 .../src/jvm/backtype/storm/task/ShellBolt.java  |  75 ++-
 .../backtype/storm/task/TopologyContext.java    |  28 +
 .../storm/testing/PythonShellMetricsBolt.java   |  32 ++
 .../storm/testing/PythonShellMetricsSpout.java  |  35 ++
 .../src/jvm/backtype/storm/utils/Monitor.java   | 249 ++++++++
 .../jvm/backtype/storm/utils/ShellProcess.java  |  46 +-
 .../jvm/backtype/storm/utils/ShellUtils.java    | 498 ++++++++++++++++
 .../src/jvm/backtype/storm/utils/Utils.java     |  23 +-
 storm-core/src/multilang/py/storm.py            |  30 +-
 storm-core/src/multilang/rb/storm.rb            |  24 +-
 storm-core/src/ui/public/component.html         |   3 +-
 .../src/ui/public/js/jquery.tablesorter.min.js  |   9 +-
 storm-core/src/ui/public/js/moment.min.js       |   6 +
 storm-core/src/ui/public/js/script.js           |   9 +
 .../test/clj/backtype/storm/cluster_test.clj    |   3 +-
 .../test/clj/backtype/storm/config_test.clj     |  41 +-
 .../test/clj/backtype/storm/metrics_test.clj    | 206 ++++---
 .../backtype/storm/security/auth/auth_test.clj  |  11 +-
 .../test/clj/backtype/storm/supervisor_test.clj | 135 ++++-
 72 files changed, 3780 insertions(+), 454 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/02e79499/conf/defaults.yaml
----------------------------------------------------------------------
diff --cc conf/defaults.yaml
index ee66717,05948e1..3e00b3d
--- a/conf/defaults.yaml
+++ b/conf/defaults.yaml
@@@ -153,9 -155,9 +155,12 @@@ storm.messaging.netty.transfer.batch.si
  # 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
  
 +# By default, the Netty SASL authentication is set to false.  Users can override and set
it true for a specific topology.
 +storm.messaging.netty.authentication: false
 +
+ # default number of seconds group mapping service will cache user group
+ storm.group.mapping.service.cache.duration.secs: 120
+ 
  ### topology.* configs are for specific executing storms
  topology.enable.message.timeouts: true
  topology.debug: false

http://git-wip-us.apache.org/repos/asf/storm/blob/02e79499/storm-core/src/jvm/backtype/storm/Config.java
----------------------------------------------------------------------
diff --cc storm-core/src/jvm/backtype/storm/Config.java
index 46b120c,d6b45ea..94d1cb3
--- a/storm-core/src/jvm/backtype/storm/Config.java
+++ b/storm-core/src/jvm/backtype/storm/Config.java
@@@ -103,13 -102,7 +102,13 @@@ public class Config extends HashMap<Str
       * We check with this interval that whether the Netty channel is writable and try to
write pending messages
       */
      public static final String STORM_NETTY_FLUSH_CHECK_INTERVAL_MS = "storm.messaging.netty.flush.check.interval.ms";
-     public static final Object STORM_NETTY_FLUSH_CHECK_INTERVAL_MS_SCHEMA = Number.class;
-     
+     public static final Object STORM_NETTY_FLUSH_CHECK_INTERVAL_MS_SCHEMA = ConfigValidation.IntegerValidator;
++
 +    /**
 +     * Netty based messaging: Is authentication required for Netty messaging from client
worker process to server worker process.
 +     */
 +    public static final String STORM_MESSAGING_NETTY_AUTHENTICATION = "storm.messaging.netty.authentication";

 +    public static final Object STORM_MESSAGING_NETTY_AUTHENTICATION_SCHEMA = Boolean.class;
      
      /**
       * A list of hosts of ZooKeeper servers used to manage the cluster.

http://git-wip-us.apache.org/repos/asf/storm/blob/02e79499/storm-core/src/jvm/backtype/storm/messaging/netty/Client.java
----------------------------------------------------------------------


Mime
View raw message