Return-Path: X-Original-To: apmail-hbase-commits-archive@www.apache.org Delivered-To: apmail-hbase-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 4AC1B101F6 for ; Tue, 8 Mar 2016 05:16:32 +0000 (UTC) Received: (qmail 94529 invoked by uid 500); 8 Mar 2016 05:16:32 -0000 Delivered-To: apmail-hbase-commits-archive@hbase.apache.org Received: (qmail 94489 invoked by uid 500); 8 Mar 2016 05:16:32 -0000 Mailing-List: contact commits-help@hbase.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@hbase.apache.org Delivered-To: mailing list commits@hbase.apache.org Received: (qmail 94480 invoked by uid 99); 8 Mar 2016 05:16:32 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 08 Mar 2016 05:16:32 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id D911BDFBAD; Tue, 8 Mar 2016 05:16:31 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: syuanjiang@apache.org To: commits@hbase.apache.org Message-Id: <7ba31f5aa19f43248c57645408e32a63@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: hbase git commit: HBASE-15413 Procedure-V2: print out ProcedureInfo during trace (Stephen Yuan Jiang) Date: Tue, 8 Mar 2016 05:16:31 +0000 (UTC) Repository: hbase Updated Branches: refs/heads/branch-1.1 67ec0983b -> f88df7a46 HBASE-15413 Procedure-V2: print out ProcedureInfo during trace (Stephen Yuan Jiang) Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/f88df7a4 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/f88df7a4 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/f88df7a4 Branch: refs/heads/branch-1.1 Commit: f88df7a4667eee33dbf58579d7f87efc3a99947f Parents: 67ec098 Author: Stephen Yuan Jiang Authored: Mon Mar 7 20:28:45 2016 -0800 Committer: Stephen Yuan Jiang Committed: Mon Mar 7 21:12:04 2016 -0800 ---------------------------------------------------------------------- .../org/apache/hadoop/hbase/ProcedureInfo.java | 40 ++++++++++++++++++++ 1 file changed, 40 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/f88df7a4/hbase-common/src/main/java/org/apache/hadoop/hbase/ProcedureInfo.java ---------------------------------------------------------------------- diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/ProcedureInfo.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/ProcedureInfo.java index 9586eaf..2eb4494 100644 --- a/hbase-common/src/main/java/org/apache/hadoop/hbase/ProcedureInfo.java +++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/ProcedureInfo.java @@ -27,8 +27,10 @@ import org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos; import org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.ProcedureState; import org.apache.hadoop.hbase.security.User; import org.apache.hadoop.hbase.util.ByteStringer; +import org.apache.hadoop.hbase.util.EnvironmentEdgeManager; import org.apache.hadoop.hbase.util.ForeignExceptionUtil; import org.apache.hadoop.hbase.util.NonceKey; +import org.apache.hadoop.util.StringUtils; /** * Procedure information @@ -80,6 +82,40 @@ public class ProcedureInfo { exception, lastUpdate, startTime, result); } + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("Procedure="); + sb.append(procName); + sb.append(" (id="); + sb.append(procId); + if (hasParentId()) { + sb.append(", parent="); + sb.append(parentId); + } + if (hasOwner()) { + sb.append(", owner="); + sb.append(procOwner); + } + sb.append(", state="); + sb.append(procState); + + long now = EnvironmentEdgeManager.currentTime(); + sb.append(", startTime="); + sb.append(StringUtils.formatTime(now - startTime)); + sb.append(" ago, lastUpdate="); + sb.append(StringUtils.formatTime(now - startTime)); + sb.append(" ago"); + + if (isFailed()) { + sb.append(", exception=\""); + sb.append(getExceptionMessage()); + sb.append("\""); + } + sb.append(")"); + return sb.toString(); + } + public long getProcId() { return procId; } @@ -88,6 +124,10 @@ public class ProcedureInfo { return procName; } + private boolean hasOwner() { + return procOwner != null; + } + public String getProcOwner() { return procOwner; }