From 6bd772dd8b476c1cc3149d1c85aebed907facf68 Mon Sep 17 00:00:00 2001 From: Rich Howarth Date: Thu, 21 Sep 2017 17:31:32 -0400 Subject: [PATCH] HBASE-18847 remove unneeded synchronized block from HFileWriterV2 warning in branch-1.2 --- .../org/apache/hadoop/hbase/io/hfile/HFileWriterV2.java | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFileWriterV2.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFileWriterV2.java index 0eedffa..a85fde9 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFileWriterV2.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFileWriterV2.java @@ -274,13 +274,14 @@ public class HFileWriterV2 extends AbstractHFileWriter { newBlock(); } - synchronized (HFileWriterV2.class) { - if (WARN_CELL_WITH_TAGS && getFileContext().isIncludesTags()) { - LOG.warn("A minimum HFile version of " + HFile.MIN_FORMAT_VERSION_WITH_TAGS - + " is required to support cell attributes/tags. Consider setting " - + HFile.FORMAT_VERSION_KEY + " accordingly."); - WARN_CELL_WITH_TAGS = false; - } + // Reads/writes from/to WARN_CELL_WITH_TAGS aren't thread-safe, but this + // is of limited concern because it should only result in limited extra logging + + if (WARN_CELL_WITH_TAGS && getFileContext().isIncludesTags()) { + LOG.warn("A minimum HFile version of " + HFile.MIN_FORMAT_VERSION_WITH_TAGS + + " is required to support cell attributes/tags. Consider setting " + + HFile.FORMAT_VERSION_KEY + " accordingly."); + WARN_CELL_WITH_TAGS = false; } fsBlockWriter.write(cell); -- 2.7.4