You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ap...@apache.org on 2018/08/20 22:31:48 UTC
[3/3] hbase git commit: HBASE-21042 processor.getRowsToLock() always
assumes there is some row being locked in HRegion#processRowsWithLocks
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/7e473dde
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/7e473dde
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/7e473dde
Branch: refs/heads/branch-1.2
Commit: 7e473ddedb919fe27ebc804e8dc93f640467981a
Parents: 22d2c72
Author: tedyu <yu...@gmail.com>
Authored: Sat Aug 18 11:48:42 2018 -0700
Committer: Andrew Purtell <ap...@apache.org>
Committed: Mon Aug 20 15:26:00 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/7e473dde/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 0ead229..e6b65a9 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
@@ -7165,8 +7165,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();