Return-Path: X-Original-To: apmail-hbase-commits-archive@www.apache.org Delivered-To: apmail-hbase-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 808BD18BB6 for ; Fri, 23 Oct 2015 22:49:39 +0000 (UTC) Received: (qmail 98475 invoked by uid 500); 23 Oct 2015 22:49:23 -0000 Delivered-To: apmail-hbase-commits-archive@hbase.apache.org Received: (qmail 98218 invoked by uid 500); 23 Oct 2015 22:49:23 -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 96884 invoked by uid 99); 23 Oct 2015 22:49:22 -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, 23 Oct 2015 22:49:22 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 83C92E0BB6; Fri, 23 Oct 2015 22:49:22 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: syuanjiang@apache.org To: commits@hbase.apache.org Date: Fri, 23 Oct 2015 22:50:09 -0000 Message-Id: In-Reply-To: <98fea9f5c171492caac9e9f4137cef12@git.apache.org> References: <98fea9f5c171492caac9e9f4137cef12@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [49/50] [abbrv] hbase git commit: HBASE-14685 Procedure Id is not set for MasterRpcServices#modifyTable HBASE-14685 Procedure Id is not set for MasterRpcServices#modifyTable Signed-off-by: Matteo Bertozzi Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/f3401186 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/f3401186 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/f3401186 Branch: refs/heads/hbase-12439 Commit: f34011860e04fd1261b3b30cab0265016a22faa2 Parents: ef7f846 Author: Ashish Singhi Authored: Fri Oct 23 23:11:35 2015 +0530 Committer: Matteo Bertozzi Committed: Fri Oct 23 11:37:10 2015 -0700 ---------------------------------------------------------------------- .../java/org/apache/hadoop/hbase/master/MasterRpcServices.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/f3401186/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterRpcServices.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterRpcServices.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterRpcServices.java index f5dcd0e..b269c3d 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterRpcServices.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterRpcServices.java @@ -1214,15 +1214,15 @@ public class MasterRpcServices extends RSRpcServices public ModifyTableResponse modifyTable(RpcController controller, ModifyTableRequest req) throws ServiceException { try { - master.modifyTable( + long procId = master.modifyTable( ProtobufUtil.toTableName(req.getTableName()), HTableDescriptor.convert(req.getTableSchema()), req.getNonceGroup(), req.getNonce()); + return ModifyTableResponse.newBuilder().setProcId(procId).build(); } catch (IOException ioe) { throw new ServiceException(ioe); } - return ModifyTableResponse.newBuilder().build(); } @Override