You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by sr...@apache.org on 2015/09/21 19:41:04 UTC

[19/24] storm git commit: fixing a few issues post merge

fixing a few issues post merge


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

Branch: refs/heads/master
Commit: cec7ff9be618951ed91f3b8183c52e6bc6a6bd28
Parents: 0151b44
Author: Arun Mahadevan <ai...@hortonworks.com>
Authored: Thu Sep 3 13:31:53 2015 -0700
Committer: Arun Mahadevan <ai...@hortonworks.com>
Committed: Thu Sep 3 13:31:53 2015 -0700

----------------------------------------------------------------------
 storm-core/src/clj/backtype/storm/ui/core.clj | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/cec7ff9b/storm-core/src/clj/backtype/storm/ui/core.clj
----------------------------------------------------------------------
diff --git a/storm-core/src/clj/backtype/storm/ui/core.clj b/storm-core/src/clj/backtype/storm/ui/core.clj
index 7b44619..f8b0390 100644
--- a/storm-core/src/clj/backtype/storm/ui/core.clj
+++ b/storm-core/src/clj/backtype/storm/ui/core.clj
@@ -758,7 +758,7 @@
        "executorsTotal" (count executors)
        "schedulerInfo" (.get_sched_status summ)
        "debug" (if (not-nil? debug-options) (.is_enable debug-options) false)
-       "samplingPct" (if (not-nil? debug-options) (.get_samplingpct debug-options) 100)}))
+       "samplingPct" (if (not-nil? debug-options) (.get_samplingpct debug-options) 100)
        "replicationCount" (.get_replication_count summ)}))
 
 (defn spout-summary-json [topology-id id stats window]
@@ -1083,7 +1083,7 @@
     (json-response (topology-op-response id "deactivate") (m "callback")))
   (POST "/api/v1/topology/:id/debug/:action/:spct" [:as {:keys [cookies servlet-request]} id action spct & m]
     (assert-authorized-user servlet-request "debug" (topology-config id))
-    (with-nimbus nimbus
+    (thrift/with-configured-nimbus-connection nimbus
       (let [tplg (->> (doto
                         (GetInfoOptions.)
                         (.set_num_err_choice NumErrorsChoice/NONE))
@@ -1095,7 +1095,7 @@
     (json-response (topology-op-response id (str "debug/" action)) (m "callback")))
   (POST "/api/v1/topology/:id/component/:component/debug/:action/:spct" [:as {:keys [cookies servlet-request]} id component action spct & m]
     (assert-authorized-user servlet-request "debug" (topology-config id))
-    (with-nimbus nimbus
+    (thrift/with-configured-nimbus-connection nimbus
       (let [tplg (->> (doto
                         (GetInfoOptions.)
                         (.set_num_err_choice NumErrorsChoice/NONE))