You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by da...@apache.org on 2015/12/17 18:12:09 UTC
[1/6] storm git commit: Correct timeouts to match units (milliseconds)
Repository: storm
Updated Branches:
refs/heads/master 568908549 -> 4e0694b22
Correct timeouts to match units (milliseconds)
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/402b8d21
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/402b8d21
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/402b8d21
Branch: refs/heads/master
Commit: 402b8d215e2cebb7d7f15931aabaee695520f92d
Parents: a3f343a
Author: Derek Dagit <de...@yahoo-inc.com>
Authored: Thu Dec 10 23:26:12 2015 +0000
Committer: Derek Dagit <de...@yahoo-inc.com>
Committed: Thu Dec 10 23:26:12 2015 +0000
----------------------------------------------------------------------
.../storm/security/auth/ThriftClient_test.clj | 16 ++++++++--------
.../clj/backtype/storm/security/auth/auth_test.clj | 2 +-
.../backtype/storm/security/auth/drpc_auth_test.clj | 2 --
.../storm/security/auth/nimbus_auth_test.clj | 2 +-
4 files changed, 10 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/402b8d21/storm-core/test/clj/backtype/storm/security/auth/ThriftClient_test.clj
----------------------------------------------------------------------
diff --git a/storm-core/test/clj/backtype/storm/security/auth/ThriftClient_test.clj b/storm-core/test/clj/backtype/storm/security/auth/ThriftClient_test.clj
index 2eee963..73f3c15 100644
--- a/storm-core/test/clj/backtype/storm/security/auth/ThriftClient_test.clj
+++ b/storm-core/test/clj/backtype/storm/security/auth/ThriftClient_test.clj
@@ -20,26 +20,26 @@
(:import [org.apache.thrift.transport TTransportException])
)
+(def TIMEOUT (Integer. (* 3 1000)))
+
(deftest test-ctor-throws-if-port-invalid
(let [conf (merge
(read-default-config)
- {STORM-NIMBUS-RETRY-TIMES 0})
- timeout (Integer. 30)]
+ {STORM-NIMBUS-RETRY-TIMES 0})]
(is (thrown-cause? java.lang.IllegalArgumentException
- (ThriftClient. conf ThriftConnectionType/DRPC "bogushost" (int -1) timeout)))
+ (ThriftClient. conf ThriftConnectionType/DRPC "bogushost" (int -1) TIMEOUT)))
(is (thrown-cause? java.lang.IllegalArgumentException
- (ThriftClient. conf ThriftConnectionType/DRPC "bogushost" (int 0) timeout)))
+ (ThriftClient. conf ThriftConnectionType/DRPC "bogushost" (int 0) TIMEOUT)))
)
)
(deftest test-ctor-throws-if-host-not-set
(let [conf (merge
(read-default-config)
- {STORM-NIMBUS-RETRY-TIMES 0})
- timeout (Integer. 60)]
+ {STORM-NIMBUS-RETRY-TIMES 0})]
(is (thrown-cause? TTransportException
- (ThriftClient. conf ThriftConnectionType/DRPC "" (int 4242) timeout)))
+ (ThriftClient. conf ThriftConnectionType/DRPC "" (int 4242) TIMEOUT)))
(is (thrown-cause? IllegalArgumentException
- (ThriftClient. conf ThriftConnectionType/DRPC nil (int 4242) timeout)))
+ (ThriftClient. conf ThriftConnectionType/DRPC nil (int 4242) TIMEOUT)))
)
)
http://git-wip-us.apache.org/repos/asf/storm/blob/402b8d21/storm-core/test/clj/backtype/storm/security/auth/auth_test.clj
----------------------------------------------------------------------
diff --git a/storm-core/test/clj/backtype/storm/security/auth/auth_test.clj b/storm-core/test/clj/backtype/storm/security/auth/auth_test.clj
index cb4ccc8..4f253ba 100644
--- a/storm-core/test/clj/backtype/storm/security/auth/auth_test.clj
+++ b/storm-core/test/clj/backtype/storm/security/auth/auth_test.clj
@@ -47,7 +47,7 @@
(defn mk-subject [name]
(Subject. true #{(mk-principal name)} #{} #{}))
-(def nimbus-timeout (Integer. 120))
+(def nimbus-timeout (Integer. (* 3 1000)))
(defn nimbus-data [storm-conf inimbus]
(let [forced-scheduler (.getForcedScheduler inimbus)]
http://git-wip-us.apache.org/repos/asf/storm/blob/402b8d21/storm-core/test/clj/backtype/storm/security/auth/drpc_auth_test.clj
----------------------------------------------------------------------
diff --git a/storm-core/test/clj/backtype/storm/security/auth/drpc_auth_test.clj b/storm-core/test/clj/backtype/storm/security/auth/drpc_auth_test.clj
index 1149a60..7c61841 100644
--- a/storm-core/test/clj/backtype/storm/security/auth/drpc_auth_test.clj
+++ b/storm-core/test/clj/backtype/storm/security/auth/drpc_auth_test.clj
@@ -29,8 +29,6 @@
(:use [backtype.storm.daemon common])
(:use [backtype.storm testing]))
-(def drpc-timeout (Integer. 30))
-
(def DRPC-TIMEOUT-SEC (* (/ TEST-TIMEOUT-MS 1000) 2))
(defn launch-server [conf drpcAznClass transportPluginClass login-cfg client-port invocations-port]
http://git-wip-us.apache.org/repos/asf/storm/blob/402b8d21/storm-core/test/clj/backtype/storm/security/auth/nimbus_auth_test.clj
----------------------------------------------------------------------
diff --git a/storm-core/test/clj/backtype/storm/security/auth/nimbus_auth_test.clj b/storm-core/test/clj/backtype/storm/security/auth/nimbus_auth_test.clj
index dbf0891..8d7ac92 100644
--- a/storm-core/test/clj/backtype/storm/security/auth/nimbus_auth_test.clj
+++ b/storm-core/test/clj/backtype/storm/security/auth/nimbus_auth_test.clj
@@ -31,7 +31,7 @@
(:require [conjure.core])
(:use [conjure core]))
-(def nimbus-timeout (Integer. 30))
+(def nimbus-timeout (Integer. (* 3 1000)))
(defn launch-test-cluster [nimbus-port login-cfg aznClass transportPluginClass]
(let [conf {NIMBUS-AUTHORIZER aznClass
[4/6] storm git commit: Merge branch
'storm-1377-auth-tests-correct-timeouts' of https://github.com/d2r/storm into
STORM-1377-merge
Posted by da...@apache.org.
Merge branch 'storm-1377-auth-tests-correct-timeouts' of https://github.com/d2r/storm into STORM-1377-merge
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/4a746c37
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/4a746c37
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/4a746c37
Branch: refs/heads/master
Commit: 4a746c37c50018bb6e4baf6e90d6f4352d6e8b72
Parents: 5689085 3f0281b
Author: Derek Dagit <de...@yahoo-inc.com>
Authored: Thu Dec 17 11:07:39 2015 -0600
Committer: Derek Dagit <de...@yahoo-inc.com>
Committed: Thu Dec 17 11:07:39 2015 -0600
----------------------------------------------------------------------
.../storm/security/auth/ThriftClient_test.clj | 31 +++++++++++++++-----
.../backtype/storm/security/auth/auth_test.clj | 4 ++-
.../storm/security/auth/drpc_auth_test.clj | 2 --
.../storm/security/auth/nimbus_auth_test.clj | 3 +-
4 files changed, 27 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
[6/6] storm git commit: Merge branch 'STORM-1377-merge'
Posted by da...@apache.org.
Merge branch 'STORM-1377-merge'
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/4e0694b2
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/4e0694b2
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/4e0694b2
Branch: refs/heads/master
Commit: 4e0694b2201e2f3e3952386ed59b7af54e1350d3
Parents: 5689085 390abb9
Author: Derek Dagit <de...@yahoo-inc.com>
Authored: Thu Dec 17 11:09:50 2015 -0600
Committer: Derek Dagit <de...@yahoo-inc.com>
Committed: Thu Dec 17 11:09:50 2015 -0600
----------------------------------------------------------------------
CHANGELOG.md | 1 +
.../storm/security/auth/ThriftClient_test.clj | 31 +++++++++++++++-----
.../backtype/storm/security/auth/auth_test.clj | 4 ++-
.../storm/security/auth/drpc_auth_test.clj | 2 --
.../storm/security/auth/nimbus_auth_test.clj | 3 +-
5 files changed, 28 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
[2/6] storm git commit: refers to a common nimbus timeout
Posted by da...@apache.org.
refers to a common nimbus timeout
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/e723112a
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/e723112a
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/e723112a
Branch: refs/heads/master
Commit: e723112acef519bc1d19e8414bd4925fe803cb8f
Parents: 402b8d2
Author: Derek Dagit <de...@yahoo-inc.com>
Authored: Tue Dec 15 09:20:20 2015 -0600
Committer: Derek Dagit <de...@yahoo-inc.com>
Committed: Tue Dec 15 09:20:20 2015 -0600
----------------------------------------------------------------------
.../storm/security/auth/ThriftClient_test.clj | 27 +++++++++++++++-----
.../storm/security/auth/nimbus_auth_test.clj | 3 +--
2 files changed, 22 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/e723112a/storm-core/test/clj/backtype/storm/security/auth/ThriftClient_test.clj
----------------------------------------------------------------------
diff --git a/storm-core/test/clj/backtype/storm/security/auth/ThriftClient_test.clj b/storm-core/test/clj/backtype/storm/security/auth/ThriftClient_test.clj
index 73f3c15..cab5730 100644
--- a/storm-core/test/clj/backtype/storm/security/auth/ThriftClient_test.clj
+++ b/storm-core/test/clj/backtype/storm/security/auth/ThriftClient_test.clj
@@ -16,20 +16,27 @@
(ns backtype.storm.security.auth.ThriftClient-test
(:use [backtype.storm config util])
(:use [clojure test])
+ (:require [backtype.storm.security.auth [auth-test :refer [nimbus-timeout]]])
(:import [backtype.storm.security.auth ThriftClient ThriftConnectionType])
(:import [org.apache.thrift.transport TTransportException])
)
-(def TIMEOUT (Integer. (* 3 1000)))
-
(deftest test-ctor-throws-if-port-invalid
(let [conf (merge
(read-default-config)
{STORM-NIMBUS-RETRY-TIMES 0})]
(is (thrown-cause? java.lang.IllegalArgumentException
- (ThriftClient. conf ThriftConnectionType/DRPC "bogushost" (int -1) TIMEOUT)))
+ (ThriftClient. conf
+ ThriftConnectionType/DRPC
+ "bogushost"
+ (int -1)
+ nimbus-timeout)))
(is (thrown-cause? java.lang.IllegalArgumentException
- (ThriftClient. conf ThriftConnectionType/DRPC "bogushost" (int 0) TIMEOUT)))
+ (ThriftClient. conf
+ ThriftConnectionType/DRPC
+ "bogushost"
+ (int 0)
+ nimbus-timeout)))
)
)
@@ -38,8 +45,16 @@
(read-default-config)
{STORM-NIMBUS-RETRY-TIMES 0})]
(is (thrown-cause? TTransportException
- (ThriftClient. conf ThriftConnectionType/DRPC "" (int 4242) TIMEOUT)))
+ (ThriftClient. conf
+ ThriftConnectionType/DRPC
+ ""
+ (int 4242)
+ nimbus-timeout)))
(is (thrown-cause? IllegalArgumentException
- (ThriftClient. conf ThriftConnectionType/DRPC nil (int 4242) TIMEOUT)))
+ (ThriftClient. conf
+ ThriftConnectionType/DRPC
+ nil
+ (int 4242)
+ nimbus-timeout)))
)
)
http://git-wip-us.apache.org/repos/asf/storm/blob/e723112a/storm-core/test/clj/backtype/storm/security/auth/nimbus_auth_test.clj
----------------------------------------------------------------------
diff --git a/storm-core/test/clj/backtype/storm/security/auth/nimbus_auth_test.clj b/storm-core/test/clj/backtype/storm/security/auth/nimbus_auth_test.clj
index 8d7ac92..db5dcc2 100644
--- a/storm-core/test/clj/backtype/storm/security/auth/nimbus_auth_test.clj
+++ b/storm-core/test/clj/backtype/storm/security/auth/nimbus_auth_test.clj
@@ -18,6 +18,7 @@
(:require [backtype.storm [testing :as testing]])
(:require [backtype.storm.daemon [nimbus :as nimbus]])
(:require [backtype.storm [zookeeper :as zk]])
+ (:require [backtype.storm.security.auth [auth-test :refer [nimbus-timeout]]])
(:import [java.nio ByteBuffer])
(:import [backtype.storm Config])
(:import [backtype.storm.utils NimbusClient])
@@ -31,8 +32,6 @@
(:require [conjure.core])
(:use [conjure core]))
-(def nimbus-timeout (Integer. (* 3 1000)))
-
(defn launch-test-cluster [nimbus-port login-cfg aznClass transportPluginClass]
(let [conf {NIMBUS-AUTHORIZER aznClass
NIMBUS-THRIFT-PORT nimbus-port
[5/6] storm git commit: adds STORM-1377
Posted by da...@apache.org.
adds STORM-1377
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/390abb9e
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/390abb9e
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/390abb9e
Branch: refs/heads/master
Commit: 390abb9ed94c55e2c646dfb9f88b00059c03baed
Parents: 4a746c3
Author: Derek Dagit <de...@yahoo-inc.com>
Authored: Thu Dec 17 11:08:10 2015 -0600
Committer: Derek Dagit <de...@yahoo-inc.com>
Committed: Thu Dec 17 11:08:10 2015 -0600
----------------------------------------------------------------------
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/390abb9e/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index c4acb4e..1555adc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
## 0.11.0
+ * STORM-1377: nimbus_auth_test: very short timeouts causing spurious failures
* STORM-1388: Fix url and email links in README file
* STORM-1389: Removed creation of projection tuples as they are already available
* STORM-1179: Create Maven Profiles for Integration Tests.
[3/6] storm git commit: adds clarifying comment about timeout value
Posted by da...@apache.org.
adds clarifying comment about timeout value
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/3f0281bd
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/3f0281bd
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/3f0281bd
Branch: refs/heads/master
Commit: 3f0281bdd394b9fbeec2c54e9add86089cbcdf29
Parents: e723112
Author: Derek Dagit <de...@yahoo-inc.com>
Authored: Tue Dec 15 09:20:49 2015 -0600
Committer: Derek Dagit <de...@yahoo-inc.com>
Committed: Tue Dec 15 09:20:49 2015 -0600
----------------------------------------------------------------------
storm-core/test/clj/backtype/storm/security/auth/auth_test.clj | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/3f0281bd/storm-core/test/clj/backtype/storm/security/auth/auth_test.clj
----------------------------------------------------------------------
diff --git a/storm-core/test/clj/backtype/storm/security/auth/auth_test.clj b/storm-core/test/clj/backtype/storm/security/auth/auth_test.clj
index 4f253ba..c422f83 100644
--- a/storm-core/test/clj/backtype/storm/security/auth/auth_test.clj
+++ b/storm-core/test/clj/backtype/storm/security/auth/auth_test.clj
@@ -47,6 +47,8 @@
(defn mk-subject [name]
(Subject. true #{(mk-principal name)} #{} #{}))
+;; 3 seconds in milliseconds
+;; This is plenty of time for a thrift client to respond.
(def nimbus-timeout (Integer. (* 3 1000)))
(defn nimbus-data [storm-conf inimbus]