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 5490D200B4F for ; Tue, 12 Jul 2016 01:47:56 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 53373160A86; Mon, 11 Jul 2016 23:47:56 +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 A2F2D160A78 for ; Tue, 12 Jul 2016 01:47:55 +0200 (CEST) Received: (qmail 25004 invoked by uid 500); 11 Jul 2016 23:47:54 -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 24983 invoked by uid 99); 11 Jul 2016 23:47:54 -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; Mon, 11 Jul 2016 23:47:54 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 91B6BE03C0; Mon, 11 Jul 2016 23:47:54 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: eclark@apache.org To: commits@hbase.apache.org Date: Mon, 11 Jul 2016 23:47:56 -0000 Message-Id: In-Reply-To: <72e4c5e7efc34fbfa3e7b8cff6ac6200@git.apache.org> References: <72e4c5e7efc34fbfa3e7b8cff6ac6200@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [03/50] [abbrv] hbase git commit: HBASE-16201 NPE in RpcServer causing intermittent UT failure of TestMasterReplication#testHFileCyclicReplication archived-at: Mon, 11 Jul 2016 23:47:56 -0000 HBASE-16201 NPE in RpcServer causing intermittent UT failure of TestMasterReplication#testHFileCyclicReplication Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/3c39cbd9 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/3c39cbd9 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/3c39cbd9 Branch: refs/heads/HBASE-14850 Commit: 3c39cbd92c3f309c98ca01bfb70ca89bc046a228 Parents: 1578a04 Author: Yu Li Authored: Sat Jul 9 01:05:10 2016 +0800 Committer: Yu Li Committed: Sat Jul 9 02:02:00 2016 +0800 ---------------------------------------------------------------------- .../src/main/java/org/apache/hadoop/hbase/ipc/RpcServer.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/3c39cbd9/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/RpcServer.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/RpcServer.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/RpcServer.java index ad88e8e..73226aa 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/RpcServer.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/RpcServer.java @@ -2246,7 +2246,13 @@ public class RpcServer implements RpcServerInterface, ConfigurationObserver { // The above callBlockingMethod will always return a SE. Strip the SE wrapper before // putting it on the wire. Its needed to adhere to the pb Service Interface but we don't // need to pass it over the wire. - if (e instanceof ServiceException) e = e.getCause(); + if (e instanceof ServiceException) { + if (e.getCause() == null) { + LOG.debug("Caught a ServiceException with null cause", e); + } else { + e = e.getCause(); + } + } // increment the number of requests that were exceptions. metrics.exception(e);