From 65d89f4dafa53cc855d7dc695ec0da9ccf4e2991 Mon Sep 17 00:00:00 2001 From: Elliott Clark Date: Mon, 5 Oct 2015 17:20:54 -0700 Subject: [PATCH] HBASE-14555 Fix Deadlock in MVCC branch-1.2 toString() --- .../regionserver/MultiVersionConcurrencyControl.java | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MultiVersionConcurrencyControl.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MultiVersionConcurrencyControl.java index 00f349e..728292d 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MultiVersionConcurrencyControl.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MultiVersionConcurrencyControl.java @@ -23,6 +23,7 @@ import java.util.concurrent.atomic.AtomicLong; import com.google.common.annotations.VisibleForTesting; +import com.google.common.base.Objects; import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.ClassSize; @@ -225,19 +226,9 @@ public class MultiVersionConcurrencyControl { @VisibleForTesting public String toString() { - StringBuffer sb = new StringBuffer(256); - sb.append("readPoint="); - sb.append(this.readPoint.get()); - sb.append(", writePoint="); - sb.append(this.writePoint); - synchronized (this.writeQueue) { - for (WriteEntry we: this.writeQueue) { - sb.append(", ["); - sb.append(we); - sb.append("]"); - } - } - return sb.toString(); + return Objects.toStringHelper(this) + .add("readPoint", readPoint) + .add("writePoint", writePoint).toString(); } public long getReadPoint() { -- 2.6.0