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 024CD200BF6 for ; Mon, 26 Dec 2016 13:39:42 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id F3168160B3B; Mon, 26 Dec 2016 12:39:41 +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 54645160B41 for ; Mon, 26 Dec 2016 13:39:41 +0100 (CET) Received: (qmail 94382 invoked by uid 500); 26 Dec 2016 12:39:40 -0000 Mailing-List: contact commits-help@kylin.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@kylin.apache.org Delivered-To: mailing list commits@kylin.apache.org Received: (qmail 94252 invoked by uid 99); 26 Dec 2016 12:39:40 -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, 26 Dec 2016 12:39:40 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 45C77F175F; Mon, 26 Dec 2016 12:39:40 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: liyang@apache.org To: commits@kylin.apache.org Date: Mon, 26 Dec 2016 12:39:43 -0000 Message-Id: In-Reply-To: <70b86eb7602246a2a84c1586ff13627e@git.apache.org> References: <70b86eb7602246a2a84c1586ff13627e@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [4/7] kylin git commit: strenthen storage visit deadline calculation archived-at: Mon, 26 Dec 2016 12:39:42 -0000 strenthen storage visit deadline calculation Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/1a1534f9 Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/1a1534f9 Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/1a1534f9 Branch: refs/heads/mhb-master Commit: 1a1534f95a1fb04bf62a943a31db10261293f15e Parents: 220a18a Author: Hongbin Ma Authored: Sat Dec 24 17:57:55 2016 +0800 Committer: Hongbin Ma Committed: Mon Dec 26 20:12:51 2016 +0800 ---------------------------------------------------------------------- .../hbase/cube/v2/coprocessor/endpoint/CubeVisitService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/1a1534f9/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/cube/v2/coprocessor/endpoint/CubeVisitService.java ---------------------------------------------------------------------- diff --git a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/cube/v2/coprocessor/endpoint/CubeVisitService.java b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/cube/v2/coprocessor/endpoint/CubeVisitService.java index 38efecc..de53d0d 100644 --- a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/cube/v2/coprocessor/endpoint/CubeVisitService.java +++ b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/cube/v2/coprocessor/endpoint/CubeVisitService.java @@ -236,7 +236,7 @@ public class CubeVisitService extends CubeVisitProtos.CubeVisitService implement } final MutableBoolean scanNormalComplete = new MutableBoolean(true); - final long deadline = scanReq.getTimeout() + this.serviceStartTime; + final long deadline = scanReq.getStartTime() + scanReq.getTimeout(); logger.info("deadline is " + deadline); final long storagePushDownLimit = scanReq.getStoragePushDownLimit();