From f05114a0d127d51aae55fd844dc048e1aca2efc4 Mon Sep 17 00:00:00 2001 From: Jungtaek Lim Date: Fri, 17 Jun 2016 09:40:17 +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 ea1de6e2fc1..615070d9bf5 100644 --- a/storm-core/src/clj/org/apache/storm/daemon/nimbus.clj +++ b/storm-core/src/clj/org/apache/storm/daemon/nimbus.clj @@ -1372,7 +1372,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" @@ -1384,7 +1384,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 659dbb340bd5d8ec0d8c43a14e60486ec4d2fee1 Mon Sep 17 00:00:00 2001 From: Jungtaek Lim Date: Mon, 20 Jun 2016 11:34:37 +0900 Subject: [PATCH 2/2] STORM-1911 IClusterMetricsConsumer should use seconds to timestamp unit * use Time.currentTimeSecs --- storm-core/src/clj/org/apache/storm/daemon/executor.clj | 2 +- storm-core/src/clj/org/apache/storm/daemon/nimbus.clj | 4 ++-- 2 files changed, 3 insertions(+), 3 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 6c94321d733..e23f6223b83 100644 --- a/storm-core/src/clj/org/apache/storm/daemon/executor.clj +++ b/storm-core/src/clj/org/apache/storm/daemon/executor.clj @@ -289,7 +289,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 615070d9bf5..01bf3dad9c4 100644 --- a/storm-core/src/clj/org/apache/storm/daemon/nimbus.clj +++ b/storm-core/src/clj/org/apache/storm/daemon/nimbus.clj @@ -1372,7 +1372,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" @@ -1384,7 +1384,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"