Repository: hbase Updated Branches: refs/heads/branch-1 56c59f11e -> e2974f4b9
HBASE-21042 processor.getRowsToLock() always assumes there is some row being locked in HRegion#processRowsWithLocks Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/e2974f4b Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/e2974f4b Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/e2974f4b Branch: refs/heads/branch-1 Commit: e2974f4b91136edc5206f32a4382fd7c1d61c96d Parents: 56c59f1 Author: tedyu <[email protected]> Authored: Sat Aug 18 11:47:23 2018 -0700 Committer: tedyu <[email protected]> Committed: Sat Aug 18 11:47:23 2018 -0700 ---------------------------------------------------------------------- .../main/java/org/apache/hadoop/hbase/regionserver/HRegion.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/e2974f4b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java index c62bd4f..d333619 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java @@ -7594,8 +7594,9 @@ public class HRegion implements HeapSize, PropagatingConfigurationObserver, Regi // different. Make them all share same code! if (!mutations.isEmpty() && !walSyncSuccessful) { LOG.warn("Wal sync failed. Roll back " + mutations.size() + - " memstore keyvalues for row(s):" + StringUtils.byteToHexString( - processor.getRowsToLock().iterator().next()) + "..."); + " memstore keyvalues" + (processor.getRowsToLock().isEmpty() ? "" : + (" for row(s):" + StringUtils.byteToHexString( + processor.getRowsToLock().iterator().next()) + "..."))); for (Mutation m : mutations) { for (CellScanner cellScanner = m.cellScanner(); cellScanner.advance();) { Cell cell = cellScanner.current();
