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 E4D2C200C2B for ; Thu, 16 Feb 2017 07:10:07 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id E37C9160B70; Thu, 16 Feb 2017 06:10:07 +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 3253D160B5E for ; Thu, 16 Feb 2017 07:10:07 +0100 (CET) Received: (qmail 5940 invoked by uid 500); 16 Feb 2017 06:10:05 -0000 Mailing-List: contact commits-help@hawq.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@hawq.incubator.apache.org Delivered-To: mailing list commits@hawq.incubator.apache.org Received: (qmail 5931 invoked by uid 99); 16 Feb 2017 06:10:05 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd3-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 16 Feb 2017 06:10:05 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd3-us-west.apache.org (ASF Mail Server at spamd3-us-west.apache.org) with ESMTP id B96BB185F71 for ; Thu, 16 Feb 2017 06:10:04 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd3-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -6.219 X-Spam-Level: X-Spam-Status: No, score=-6.219 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-2.999] autolearn=disabled Received: from mx1-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd3-us-west.apache.org [10.40.0.10]) (amavisd-new, port 10024) with ESMTP id ZpN1hREG1tro for ; Thu, 16 Feb 2017 06:10:04 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-lw-eu.apache.org (ASF Mail Server at mx1-lw-eu.apache.org) with SMTP id 910655F659 for ; Thu, 16 Feb 2017 06:10:03 +0000 (UTC) Received: (qmail 5926 invoked by uid 99); 16 Feb 2017 06:10:02 -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; Thu, 16 Feb 2017 06:10:02 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id BBA0CDFAB2; Thu, 16 Feb 2017 06:10:02 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: mli@apache.org To: commits@hawq.incubator.apache.org Message-Id: <75c06fd0e0c04745ac8218e6e55d1296@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: incubator-hawq git commit: HAWQ-1338. Fixed writer process doesn't exit nicely in some case Date: Thu, 16 Feb 2017 06:10:02 +0000 (UTC) archived-at: Thu, 16 Feb 2017 06:10:08 -0000 Repository: incubator-hawq Updated Branches: refs/heads/master 571c50b07 -> 946fe58ee HAWQ-1338. Fixed writer process doesn't exit nicely in some case Signed-off-by: Ivan Weng Project: http://git-wip-us.apache.org/repos/asf/incubator-hawq/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-hawq/commit/946fe58e Tree: http://git-wip-us.apache.org/repos/asf/incubator-hawq/tree/946fe58e Diff: http://git-wip-us.apache.org/repos/asf/incubator-hawq/diff/946fe58e Branch: refs/heads/master Commit: 946fe58ee83eb445849a76524be894e34f822114 Parents: 571c50b Author: Ming LI Authored: Thu Feb 16 12:34:21 2017 +0800 Committer: Ivan Weng Committed: Thu Feb 16 12:47:11 2017 +0800 ---------------------------------------------------------------------- src/backend/storage/ipc/ipc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/946fe58e/src/backend/storage/ipc/ipc.c ---------------------------------------------------------------------- diff --git a/src/backend/storage/ipc/ipc.c b/src/backend/storage/ipc/ipc.c index dd7aa85..bff9a2c 100644 --- a/src/backend/storage/ipc/ipc.c +++ b/src/backend/storage/ipc/ipc.c @@ -149,7 +149,7 @@ proc_exit_prepare(int code) * desirable bail-out, and whenever you should see this situation, you * should consider to resolve the actual programming error. */ - if (CritSectionCount > 0) + if (CritSectionCount > 0 && !SuppressPanic) elog(PANIC, "process is dying from critical section"); /*