storm-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kishorvpa...@apache.org
Subject [1/2] storm git commit: STORM-3307: Fixes error time on UI for time of last error on component page
Date Fri, 04 Jan 2019 22:38:11 GMT
Repository: storm
Updated Branches:
  refs/heads/master 074fb35a0 -> 7575a0027


STORM-3307: Fixes error time on UI for time of last error on component page


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

Branch: refs/heads/master
Commit: ff5b645134cfab98b2421b187e5afe0132b85e76
Parents: 074fb35
Author: Govind Menon <govindappumenon@gmail.com>
Authored: Thu Jan 3 10:50:28 2019 -0600
Committer: Govind Menon <govindappumenon@gmail.com>
Committed: Thu Jan 3 10:50:28 2019 -0600

----------------------------------------------------------------------
 .../src/main/java/org/apache/storm/daemon/ui/UIHelpers.java    | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/ff5b6451/storm-webapp/src/main/java/org/apache/storm/daemon/ui/UIHelpers.java
----------------------------------------------------------------------
diff --git a/storm-webapp/src/main/java/org/apache/storm/daemon/ui/UIHelpers.java b/storm-webapp/src/main/java/org/apache/storm/daemon/ui/UIHelpers.java
index 5935e72..7b1f8a2 100644
--- a/storm-webapp/src/main/java/org/apache/storm/daemon/ui/UIHelpers.java
+++ b/storm-webapp/src/main/java/org/apache/storm/daemon/ui/UIHelpers.java
@@ -89,6 +89,7 @@ import org.apache.storm.stats.StatsUtil;
 import org.apache.storm.thrift.TException;
 import org.apache.storm.utils.IVersionInfo;
 import org.apache.storm.utils.ObjectReader;
+import org.apache.storm.utils.Time;
 import org.apache.storm.utils.TopologySpoutLag;
 import org.apache.storm.utils.Utils;
 import org.apache.storm.utils.VersionInfo;
@@ -1380,13 +1381,14 @@ public class UIHelpers {
     private static Map<String, Object> getComponentErrorInfo(ErrorInfo errorInfo, Map
config,
                                                              String topologyId) {
         Map<String, Object> result = new HashMap();
-        result.put("time", 1000 * (long) errorInfo.get_error_time_secs());
+        result.put("errorTime",
+                errorInfo.get_error_time_secs());
         String host = errorInfo.get_host();
         result.put("errorHost", host);
         int port = errorInfo.get_port();
         result.put("errorPort", port);
         result.put("errorWorkerLogLink", getWorkerLogLink(host, port, config, topologyId));
-        result.put("errorLapsedSecs", System.currentTimeMillis() / 1000 - errorInfo.get_error_time_secs());
+        result.put("errorLapsedSecs", Time.deltaSecs(errorInfo.get_error_time_secs()));
         result.put("error", errorInfo.get_error());
         return result;
     }


Mime
View raw message