Return-Path: X-Original-To: apmail-hawq-commits-archive@minotaur.apache.org Delivered-To: apmail-hawq-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 49D9018A9C for ; Thu, 7 Apr 2016 02:48:05 +0000 (UTC) Received: (qmail 76537 invoked by uid 500); 7 Apr 2016 02:48:05 -0000 Delivered-To: apmail-hawq-commits-archive@hawq.apache.org Received: (qmail 76520 invoked by uid 500); 7 Apr 2016 02:48: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 76511 invoked by uid 99); 7 Apr 2016 02:48:04 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd1-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 07 Apr 2016 02:48:04 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd1-us-west.apache.org (ASF Mail Server at spamd1-us-west.apache.org) with ESMTP id 86506C0C9E for ; Thu, 7 Apr 2016 02:48:04 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd1-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -4.216 X-Spam-Level: X-Spam-Status: No, score=-4.216 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=-0.996] autolearn=disabled Received: from mx2-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd1-us-west.apache.org [10.40.0.7]) (amavisd-new, port 10024) with ESMTP id A8vYBx7O89RU for ; Thu, 7 Apr 2016 02:48:02 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx2-lw-eu.apache.org (ASF Mail Server at mx2-lw-eu.apache.org) with SMTP id CFC405FAEF for ; Thu, 7 Apr 2016 02:48:01 +0000 (UTC) Received: (qmail 76499 invoked by uid 99); 7 Apr 2016 02:48:01 -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, 07 Apr 2016 02:48:01 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id DA19EE050B; Thu, 7 Apr 2016 02:48:00 +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: <4c0c49c2fdac42ab9e172eebb401d26d@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: incubator-hawq git commit: HAWQ-633. Don't error out if we cannot delete workfile directory during AbortTransaction. Date: Thu, 7 Apr 2016 02:48:00 +0000 (UTC) Repository: incubator-hawq Updated Branches: refs/heads/master 52da49ebe -> e0c96582e HAWQ-633. Don't error out if we cannot delete workfile directory during AbortTransaction. Project: http://git-wip-us.apache.org/repos/asf/incubator-hawq/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-hawq/commit/e0c96582 Tree: http://git-wip-us.apache.org/repos/asf/incubator-hawq/tree/e0c96582 Diff: http://git-wip-us.apache.org/repos/asf/incubator-hawq/diff/e0c96582 Branch: refs/heads/master Commit: e0c96582ea5b78618511e5b1a451a62e223a5c8f Parents: 52da49e Author: George Caragea Authored: Wed Apr 6 11:52:56 2016 -0700 Committer: Ming LI Committed: Thu Apr 7 10:45:15 2016 +0800 ---------------------------------------------------------------------- src/backend/utils/workfile_manager/workfile_mgr.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/e0c96582/src/backend/utils/workfile_manager/workfile_mgr.c ---------------------------------------------------------------------- diff --git a/src/backend/utils/workfile_manager/workfile_mgr.c b/src/backend/utils/workfile_manager/workfile_mgr.c index 1cce5aa..259686d 100644 --- a/src/backend/utils/workfile_manager/workfile_mgr.c +++ b/src/backend/utils/workfile_manager/workfile_mgr.c @@ -759,7 +759,14 @@ workfile_mgr_unlink_directory(const char *dirpath) if (!res) { - ereport(ERROR, + int error_level = ERROR; + + /* If we are already in an abort transaction, don't throw an exception */ + if (IsAbortInProgress()) + { + error_level = WARNING; + } + ereport(error_level, (errcode(ERRCODE_IO_ERROR), errmsg("could not remove spill file directory"))); }