From patchwork Thu Jan 7 19:38:12 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Jackson X-Patchwork-Id: 7979431 Return-Path: X-Original-To: patchwork-xen-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 68E2C9F6CD for ; Thu, 7 Jan 2016 19:41:51 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9B85920138 for ; Thu, 7 Jan 2016 19:41:50 +0000 (UTC) Received: from lists.xen.org (lists.xenproject.org [50.57.142.19]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B57E32013D for ; Thu, 7 Jan 2016 19:41:49 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aHGOG-0003Tc-3T; Thu, 07 Jan 2016 19:38:32 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aHGOE-0003ST-O8 for xen-devel@lists.xenproject.org; Thu, 07 Jan 2016 19:38:30 +0000 Received: from [85.158.139.211] by server-12.bemta-5.messagelabs.com id D9/3E-12831-6BEBE865; Thu, 07 Jan 2016 19:38:30 +0000 X-Env-Sender: prvs=807bdda5f=Ian.Jackson@citrix.com X-Msg-Ref: server-3.tower-206.messagelabs.com!1452195507!14546249!2 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: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 52004 invoked from network); 7 Jan 2016 19:38:29 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-3.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 7 Jan 2016 19:38:29 -0000 X-IronPort-AV: E=Sophos;i="5.20,534,1444694400"; d="scan'208";a="329689540" From: Ian Jackson To: Date: Thu, 7 Jan 2016 19:38:12 +0000 Message-ID: <1452195496-16016-4-git-send-email-ian.jackson@eu.citrix.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1452195496-16016-1-git-send-email-ian.jackson@eu.citrix.com> References: <1452195496-16016-1-git-send-email-ian.jackson@eu.citrix.com> MIME-Version: 1.0 X-DLP: MIA1 Cc: Ian Jackson , Ian Campbell Subject: [Xen-devel] [OSSTEST PATCH 3/7] Database locking: Tcl: Use db-execute X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Replace open-coded uses of pg_execute dbh STMT with jobdb::db-execute-array STMT. The only functional change is that if OSSTEST_TCL_JOBDB_DEBUG is set, there will be debugging output. But we are going to want to make db-execute do something more complicated involving pg_exec. Signed-off-by: Ian Jackson --- ms-ownerdaemon | 6 +++--- ms-queuedaemon | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ms-ownerdaemon b/ms-ownerdaemon index a228e3c..502dcfe 100755 --- a/ms-ownerdaemon +++ b/ms-ownerdaemon @@ -32,7 +32,7 @@ proc chan-destroy-stuff {chan} { jobdb::transaction resources { puts-chan-desc $chan "-- $tasks" foreach task $tasks { - pg_execute dbh " + jobdb::db-execute " UPDATE tasks SET live = 'f' WHERE taskid = $task @@ -62,7 +62,7 @@ proc cmd/create-task {chan desc} { set taskdesc $desc } jobdb::transaction resources { - pg_execute dbh " + jobdb::db-execute " INSERT INTO tasks ( type, refkey, refinfo, live) VALUES ('ownd', [pg_quote $taskdesc], [clock seconds], 't') @@ -93,7 +93,7 @@ main-daemon Owner { jobdb::db-open jobdb::transaction resources { - set nrows [pg_execute dbh " + set nrows [jobdb::db-execute " UPDATE tasks SET refkey = 'previous ' || refkey WHERE type = 'ownd' diff --git a/ms-queuedaemon b/ms-queuedaemon index b3a05ee..9325d46 100755 --- a/ms-queuedaemon +++ b/ms-queuedaemon @@ -155,7 +155,7 @@ proc runneeded-perhaps-start {} { } jobdb::transaction resources { - set nrows [pg_execute dbh { + set nrows [jobdb::db-execute { UPDATE resources SET owntaskid= (SELECT taskid FROM tasks WHERE type='magic' AND refkey='allocatable') @@ -167,7 +167,7 @@ proc runneeded-perhaps-start {} { if {!($nrows || $needed>=2)} return jobdb::transaction resources { - set cleaned [pg_execute dbh { + set cleaned [jobdb::db-execute { DELETE FROM tasks WHERE type='ownd' AND live='f' @@ -650,7 +650,7 @@ proc cmd/uptime {chan desc seconds} { continue } if {$refinfo > $before} continue - pg_execute dbh " + jobdb::db-execute " UPDATE tasks SET live = false, refinfo = refinfo || ' stale'