From 1cf0cc41ac72433149c73c5f296036ee66c08666 Mon Sep 17 00:00:00 2001 From: Jungtaek Lim Date: Fri, 17 Jun 2016 09:43:10 +0900 Subject: [PATCH 1/2] STORM-1911 IClusterMetricsConsumer should use seconds to timestamp unit * to have consistency with IMetricsConsumer --- storm-core/src/clj/org/apache/storm/daemon/nimbus.clj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/storm-core/src/clj/org/apache/storm/daemon/nimbus.clj b/storm-core/src/clj/org/apache/storm/daemon/nimbus.clj index f96fe7d019c..2e411424b5d 100644 --- a/storm-core/src/clj/org/apache/storm/daemon/nimbus.clj +++ b/storm-core/src/clj/org/apache/storm/daemon/nimbus.clj @@ -1369,7 +1369,7 @@ (defn extract-cluster-metrics [^ClusterSummary summ] (let [cluster-summ (ui/cluster-summary summ "nimbus")] - {:cluster-info (IClusterMetricsConsumer$ClusterInfo. (System/currentTimeMillis)) + {:cluster-info (IClusterMetricsConsumer$ClusterInfo. (long (/ (System/currentTimeMillis) 1000))) :data-points (map (fn [[k v]] (DataPoint. k v)) (select-keys cluster-summ ["supervisors" "topologies" "slotsTotal" "slotsUsed" "slotsFree" @@ -1382,7 +1382,7 @@ {:supervisor-info (IClusterMetricsConsumer$SupervisorInfo. (supervisor-summ "host") (supervisor-summ "id") - (System/currentTimeMillis)) + (long (/ (System/currentTimeMillis) 1000))) :data-points (map (fn [[k v]] (DataPoint. k v)) (select-keys supervisor-summ ["slotsTotal" "slotsUsed" "totalMem" "totalCpu" From cb41b740829439a6c7294cdbbb98ec4e948c68a7 Mon Sep 17 00:00:00 2001 From: Jungtaek Lim Date: Mon, 20 Jun 2016 11:43:48 +0900 Subject: [PATCH 2/2] STORM-1911 Inconsistency of timestamp between IMetricsConsumer and IClusterMetricsConsumer * use Time.currentTimeSecs --- storm-core/src/clj/org/apache/storm/daemon/executor.clj | 2 +- storm-core/src/clj/org/apache/storm/daemon/nimbus.clj | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/storm-core/src/clj/org/apache/storm/daemon/executor.clj b/storm-core/src/clj/org/apache/storm/daemon/executor.clj index d50e494c743..d035acc1bb4 100644 --- a/storm-core/src/clj/org/apache/storm/daemon/executor.clj +++ b/storm-core/src/clj/org/apache/storm/daemon/executor.clj @@ -337,7 +337,7 @@ (.getThisWorkerPort worker-context) (:component-id executor-data) task-id - (long (/ (System/currentTimeMillis) 1000)) + (long (Time/currentTimeSecs)) interval) data-points (->> name->imetric (map (fn [[name imetric]] diff --git a/storm-core/src/clj/org/apache/storm/daemon/nimbus.clj b/storm-core/src/clj/org/apache/storm/daemon/nimbus.clj index 2e411424b5d..1012e432ded 100644 --- a/storm-core/src/clj/org/apache/storm/daemon/nimbus.clj +++ b/storm-core/src/clj/org/apache/storm/daemon/nimbus.clj @@ -58,7 +58,7 @@ (:use [org.apache.storm.daemon common]) (:use [org.apache.storm config]) (:import [org.apache.zookeeper data.ACL ZooDefs$Ids ZooDefs$Perms]) - (:import [org.apache.storm.utils VersionInfo] + (:import [org.apache.storm.utils VersionInfo Time] (org.apache.storm.metric ClusterMetricsConsumerExecutor) (org.apache.storm.metric.api IClusterMetricsConsumer$ClusterInfo DataPoint IClusterMetricsConsumer$SupervisorInfo) (org.apache.storm Config)) @@ -1369,7 +1369,7 @@ (defn extract-cluster-metrics [^ClusterSummary summ] (let [cluster-summ (ui/cluster-summary summ "nimbus")] - {:cluster-info (IClusterMetricsConsumer$ClusterInfo. (long (/ (System/currentTimeMillis) 1000))) + {:cluster-info (IClusterMetricsConsumer$ClusterInfo. (long (Time/currentTimeSecs))) :data-points (map (fn [[k v]] (DataPoint. k v)) (select-keys cluster-summ ["supervisors" "topologies" "slotsTotal" "slotsUsed" "slotsFree" @@ -1382,7 +1382,7 @@ {:supervisor-info (IClusterMetricsConsumer$SupervisorInfo. (supervisor-summ "host") (supervisor-summ "id") - (long (/ (System/currentTimeMillis) 1000))) + (long (Time/currentTimeSecs))) :data-points (map (fn [[k v]] (DataPoint. k v)) (select-keys supervisor-summ ["slotsTotal" "slotsUsed" "totalMem" "totalCpu"