You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2021/02/08 21:14:18 UTC
[hbase] branch branch-2 updated: HBASE-25550 More readable
Competition Time (#2925)
This is an automated email from the ASF dual-hosted git repository.
stack pushed a commit to branch branch-2
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/branch-2 by this push:
new 2a4e038 HBASE-25550 More readable Competition Time (#2925)
2a4e038 is described below
commit 2a4e0382d29f6b32906642cf33fbd1ed0fef01e8
Author: GeorryHuang <21...@qq.com>
AuthorDate: Tue Feb 9 05:12:24 2021 +0800
HBASE-25550 More readable Competition Time (#2925)
---
.../org/apache/hadoop/hbase/tmpl/common/TaskMonitorTmpl.jamon | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/common/TaskMonitorTmpl.jamon b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/common/TaskMonitorTmpl.jamon
index 8d09027..9da2ffe 100644
--- a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/common/TaskMonitorTmpl.jamon
+++ b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/common/TaskMonitorTmpl.jamon
@@ -117,7 +117,13 @@ String parent = "";
<td><% task.getStatus() %>
(since <% StringUtils.formatTimeDiff(now, task.getStatusTime()) %>
ago)</td>
- <td><% task.getCompletionTimestamp() < 0 ? task.getState() : new Date(task.getCompletionTimestamp()) %></td>
+ <td>
+ <%if task.getCompletionTimestamp() < 0 %>
+ <% task.getState() %>
+ <%else>
+ <% new Date(task.getCompletionTimestamp()) %> (since <% StringUtils.formatTimeDiff(now, task.getCompletionTimestamp()) %> ago)
+ </%if>
+ </td>
</tr>
</%for>
</table>