Repository: hbase Updated Branches: refs/heads/branch-2.1 5ec30837a -> 13955ba53
HBASE-21507 Compaction failed when execute AbstractMultiFileWriter.beforeShipped() method Signed-off-by: zhangduo <zhang...@apache.org> Signed-off-by: Anoop Sam John <anoop.hb...@gmail.com> Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/13955ba5 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/13955ba5 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/13955ba5 Branch: refs/heads/branch-2.1 Commit: 13955ba532e05fb2f811f2835c0a78d99fa2adf1 Parents: 5ec3083 Author: lixiaobao <aobao0...@gmail.com> Authored: Tue Nov 27 20:30:23 2018 +0800 Committer: zhangduo <zhang...@apache.org> Committed: Tue Nov 27 20:31:54 2018 +0800 ---------------------------------------------------------------------- .../hbase/regionserver/AbstractMultiFileWriter.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/13955ba5/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/AbstractMultiFileWriter.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/AbstractMultiFileWriter.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/AbstractMultiFileWriter.java index 2fdab81..43d0ad8 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/AbstractMultiFileWriter.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/AbstractMultiFileWriter.java @@ -21,12 +21,10 @@ import java.io.IOException; import java.util.ArrayList; import java.util.Collection; import java.util.List; - import org.apache.hadoop.fs.Path; import org.apache.yetus.audience.InterfaceAudience; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.hadoop.hbase.regionserver.CellSink; /** * Base class for cell sink that separates the provided cells into multiple files. @@ -119,9 +117,12 @@ public abstract class AbstractMultiFileWriter implements CellSink, ShipperListen @Override public void beforeShipped() throws IOException { - if (this.writers() != null) { - for (StoreFileWriter writer : writers()) { - writer.beforeShipped(); + Collection<StoreFileWriter> writers = writers(); + if (writers != null) { + for (StoreFileWriter writer : writers) { + if (writer != null) { + writer.beforeShipped(); + } } } }