Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 72A15200D1F for ; Fri, 13 Oct 2017 17:48:37 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 7115F1609E9; Fri, 13 Oct 2017 15:48:37 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id B71931609D1 for ; Fri, 13 Oct 2017 17:48:36 +0200 (CEST) Received: (qmail 99181 invoked by uid 500); 13 Oct 2017 15:48:35 -0000 Mailing-List: contact commits-help@hbase.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@hbase.apache.org Delivered-To: mailing list commits@hbase.apache.org Received: (qmail 99170 invoked by uid 99); 13 Oct 2017 15:48:35 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 13 Oct 2017 15:48:35 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id D22D1DFA25; Fri, 13 Oct 2017 15:48:34 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: tedyu@apache.org To: commits@hbase.apache.org Message-Id: <5e6a05faacd144d6a367e1111d6fb700@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: hbase git commit: HBASE-18998 processor.getRowsToLock() always assumes there is some row being locked Date: Fri, 13 Oct 2017 15:48:34 +0000 (UTC) archived-at: Fri, 13 Oct 2017 15:48:37 -0000 Repository: hbase Updated Branches: refs/heads/branch-1.1 9647351ec -> 3a86bfc26 HBASE-18998 processor.getRowsToLock() always assumes there is some row being locked Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/3a86bfc2 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/3a86bfc2 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/3a86bfc2 Branch: refs/heads/branch-1.1 Commit: 3a86bfc26282ea333363d917c9568a122927cdbe Parents: 9647351 Author: tedyu Authored: Fri Oct 13 08:48:27 2017 -0700 Committer: tedyu Committed: Fri Oct 13 08:48:27 2017 -0700 ---------------------------------------------------------------------- .../apache/hadoop/hbase/regionserver/HRegion.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/3a86bfc2/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 ccb6a5c..53de3fc 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 @@ -6883,10 +6883,10 @@ public class HRegion implements HeapSize, PropagatingConfigurationObserver, Regi try { processor.process(now, region, mutations, walEdit); } catch (IOException e) { + String row = processor.getRowsToLock().isEmpty() ? "" : + " on row(s):" + Bytes.toStringBinary(processor.getRowsToLock().iterator().next()) + "..."; LOG.warn("RowProcessor:" + processor.getClass().getName() + - " throws Exception on row(s):" + - Bytes.toStringBinary( - processor.getRowsToLock().iterator().next()) + "...", e); + " throws Exception" + row, e); throw e; } return; @@ -6901,10 +6901,10 @@ public class HRegion implements HeapSize, PropagatingConfigurationObserver, Regi processor.process(now, region, mutations, walEdit); return null; } catch (IOException e) { + String row = processor.getRowsToLock().isEmpty() ? "" : + " on row(s):" + Bytes.toStringBinary(processor.getRowsToLock().iterator().next()) + "..."; LOG.warn("RowProcessor:" + processor.getClass().getName() + - " throws Exception on row(s):" + - Bytes.toStringBinary( - processor.getRowsToLock().iterator().next()) + "...", e); + " throws Exception" + row, e); throw e; } } @@ -6913,9 +6913,9 @@ public class HRegion implements HeapSize, PropagatingConfigurationObserver, Regi try { task.get(timeout, TimeUnit.MILLISECONDS); } catch (TimeoutException te) { - LOG.error("RowProcessor timeout:" + timeout + " ms on row(s):" + - Bytes.toStringBinary(processor.getRowsToLock().iterator().next()) + - "..."); + String row = processor.getRowsToLock().isEmpty() ? "" : + " on row(s):" + Bytes.toStringBinary(processor.getRowsToLock().iterator().next()) + "..."; + LOG.error("RowProcessor timeout:" + timeout + " ms" + row); throw new IOException(te); } catch (Exception e) { throw new IOException(e);