From patchwork Fri Jul 8 18:26:15 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Jackson X-Patchwork-Id: 9221655 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 0967F60467 for ; Fri, 8 Jul 2016 18:28:51 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F15C22836F for ; Fri, 8 Jul 2016 18:28:50 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E634128375; Fri, 8 Jul 2016 18:28:50 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 9D50628389 for ; Fri, 8 Jul 2016 18:28:50 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bLaUN-0004Qe-6F; Fri, 08 Jul 2016 18:26:59 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bLaUG-0003zK-U4 for xen-devel@lists.xenproject.org; Fri, 08 Jul 2016 18:26:53 +0000 Received: from [85.158.139.211] by server-16.bemta-5.messagelabs.com id 36/AD-22255-C60FF775; Fri, 08 Jul 2016 18:26:52 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFuplkeJIrShJLcpLzFFi42JxWrrBXjf7Q32 4we1WNYvvWyYzOTB6HP5whSWAMYo1My8pvyKBNePl4mWsBVM4K9q67BoY57N3MXJySAj4S5yc fATMZhPQlWja8peti5GDQ0RAReL2XgMQk1kgVGLHC0uQCmGBYIldHzqZQGwWoIrVu9Yxg9i8A p4Sa3b/ZIKYKCdx/vhPsDgnUHzXkptg04UEPCSafzUxgowUElCTmLs+HqJVUOLkzCcsIDazgI TEwRcvmCHGcEvcPj2VeQIj3ywkZbOQlC1gZFrFqFGcWlSWWqRrZKGXVJSZnlGSm5iZo2toYKq Xm1pcnJiempOYVKyXnJ+7iREYTPUMDIw7GPtW+R1ilORgUhLl3fesPlyILyk/pTIjsTgjvqg0 J7X4EKMMB4eSBG/Oe6CcYFFqempFWmYOMKxh0hIcPEoivJtA0rzFBYm5xZnpEKlTjIpS4rxpI AkBkERGaR5cGyyWLjHKSgnzMjIwMAjxFKQW5WaWoMq/YhTnYFQS5t0NMoUnM68EbvoroMVMQI sNAsAWlyQipKQaGOsn75pjocOUucp/gZCOwPRChppFDtt6307/pSg1KbVZZzaj6TNbztNzvTZ LX7ywkMHwReOJyKRzbEcebNpwcqncWUWRy9NsdM8FrHk7x+1KddyWqm1rdhWc3l8R9flvAvuR ZdprsjSdZh9cqPjE4ea8sIBf/V6GDbLnFtTd28FyYZ6cc6up9S0lluKMREMt5qLiRABifnQ8o AIAAA== X-Env-Sender: prvs=9904f56b2=Ian.Jackson@citrix.com X-Msg-Ref: server-12.tower-206.messagelabs.com!1468002405!12825238!8 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAzMDYwNDg=\n, received_headers: No Received headers X-StarScan-Received: X-StarScan-Version: 8.46; banners=-,-,- X-VirusChecked: Checked Received: (qmail 61563 invoked from network); 8 Jul 2016 18:26:51 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-12.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 8 Jul 2016 18:26:51 -0000 X-IronPort-AV: E=Sophos;i="5.28,331,1464652800"; d="scan'208";a="372092157" From: Ian Jackson To: Date: Fri, 8 Jul 2016 19:26:15 +0100 Message-ID: <1468002385-4407-24-git-send-email-ian.jackson@eu.citrix.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1468002385-4407-1-git-send-email-ian.jackson@eu.citrix.com> References: <1468002385-4407-1-git-send-email-ian.jackson@eu.citrix.com> MIME-Version: 1.0 X-DLP: MIA2 Cc: Ian Jackson Subject: [Xen-devel] [OSSTEST PATCH 23/33] tcl daemons: db-ensure-open, -close: Make idempotent X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP Track whether we think the connection is open in dbopen. It is now therefore OK to call db-ensure-open and db-ensure-closed in other contexts. Signed-off-by: Ian Jackson --- tcl/JobDB-Executive.tcl | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/tcl/JobDB-Executive.tcl b/tcl/JobDB-Executive.tcl index da9b7e9..1763b69 100644 --- a/tcl/JobDB-Executive.tcl +++ b/tcl/JobDB-Executive.tcl @@ -79,6 +79,7 @@ proc set-flight {} { } variable dbusers 0 +variable dbopen 0 ;# 1 means known to be open and good; 0 might mean broken proc db-open {} { variable dbusers @@ -96,6 +97,11 @@ proc db-close {} { db-ensure-closed } proc db-ensure-open {} { + variable dbopen + + if {$dbopen} return + catch { db-ensure-closed } ;# clean up any detritus + set pl { use Osstest; use Osstest::Executive; @@ -109,8 +115,12 @@ proc db-ensure-open {} { # is whitespace-separated. regsub -all {;} $db_pg_dsn { } conninfo pg_connect -conninfo $conninfo -connhandle dbh + + set dbopen 1 } proc db-ensure-closed {} { + variable dbopen + set dbopen 0 pg_disconnect dbh }