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 2016/06/21 00:13:47 UTC
[1/4] storm git commit: STORM-1911 IClusterMetricsConsumer should use
seconds to timestamp unit
Repository: storm
Updated Branches:
refs/heads/master d59dadd10 -> 502107af1
STORM-1911 IClusterMetricsConsumer should use seconds to timestamp unit
* to have consistency with IMetricsConsumer
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/f05114a0
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/f05114a0
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/f05114a0
Branch: refs/heads/master
Commit: f05114a0d127d51aae55fd844dc048e1aca2efc4
Parents: 7825a5b
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Fri Jun 17 09:40:17 2016 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Fri Jun 17 09:40:17 2016 +0900
----------------------------------------------------------------------
storm-core/src/clj/org/apache/storm/daemon/nimbus.clj | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/f05114a0/storm-core/src/clj/org/apache/storm/daemon/nimbus.clj
----------------------------------------------------------------------
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 ea1de6e..615070d 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"
[4/4] storm git commit: Added STORM-1911 to CHANGELOG.
Posted by sr...@apache.org.
Added STORM-1911 to CHANGELOG.
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/502107af
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/502107af
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/502107af
Branch: refs/heads/master
Commit: 502107af184afa2c860b496388f917f7fd206d65
Parents: 18a5c79
Author: Sriharsha Chintalapani <ha...@hortonworks.com>
Authored: Mon Jun 20 17:06:21 2016 -0700
Committer: Sriharsha Chintalapani <ha...@hortonworks.com>
Committed: Mon Jun 20 17:06:21 2016 -0700
----------------------------------------------------------------------
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/502107af/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 495adb3..d0ef420 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -105,6 +105,7 @@
* STORM-1769: Added a test to check local nimbus with notifier plugin
## 1.1.0
+ * STORM-1911: IClusterMetricsConsumer should use seconds to timestamp unit
* STORM-1849: HDFSFileTopology should use the 3rd argument as topologyName
* STORM-1906: Window count/length of zero should be disallowed
* STORM-1893: Support OpenTSDB for storing timeseries data.
[3/4] storm git commit: Merge branch 'STORM-1911' of
https://github.com/HeartSaVioR/storm into STORM-1911
Posted by sr...@apache.org.
Merge branch 'STORM-1911' of https://github.com/HeartSaVioR/storm into STORM-1911
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/18a5c79b
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/18a5c79b
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/18a5c79b
Branch: refs/heads/master
Commit: 18a5c79bcf2f19246fbbc89278abdc54c37ff4b2
Parents: d59dadd 659dbb3
Author: Sriharsha Chintalapani <ha...@hortonworks.com>
Authored: Mon Jun 20 17:05:38 2016 -0700
Committer: Sriharsha Chintalapani <ha...@hortonworks.com>
Committed: Mon Jun 20 17:05:38 2016 -0700
----------------------------------------------------------------------
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(-)
----------------------------------------------------------------------
[2/4] storm git commit: STORM-1911 IClusterMetricsConsumer should use
seconds to timestamp unit
Posted by sr...@apache.org.
STORM-1911 IClusterMetricsConsumer should use seconds to timestamp unit
* use Time.currentTimeSecs
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/659dbb34
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/659dbb34
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/659dbb34
Branch: refs/heads/master
Commit: 659dbb340bd5d8ec0d8c43a14e60486ec4d2fee1
Parents: f05114a
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Mon Jun 20 11:34:37 2016 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Mon Jun 20 11:34:37 2016 +0900
----------------------------------------------------------------------
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(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/659dbb34/storm-core/src/clj/org/apache/storm/daemon/executor.clj
----------------------------------------------------------------------
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 6c94321..e23f622 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]]
http://git-wip-us.apache.org/repos/asf/storm/blob/659dbb34/storm-core/src/clj/org/apache/storm/daemon/nimbus.clj
----------------------------------------------------------------------
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 615070d..01bf3da 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"