From: Ian Jackson <ian.jackson@eu.citrix.com>
To: xen-devel@lists.xenproject.org
Cc: Ian Jackson <Ian.Jackson@eu.citrix.com>,
Ian Campbell <ian.campbell@citrix.com>
Subject: [OSSTEST PATCH 3/7] Database locking: Tcl: Use db-execute
Date: Thu, 7 Jan 2016 19:38:12 +0000 [thread overview]
Message-ID: <1452195496-16016-4-git-send-email-ian.jackson@eu.citrix.com> (raw)
In-Reply-To: <1452195496-16016-1-git-send-email-ian.jackson@eu.citrix.com>
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 <Ian.Jackson@eu.citrix.com>
---
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'
--
1.7.10.4
next prev parent reply other threads:[~2016-01-07 19:38 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-07 19:38 [OSSTEST PATCH 0/7] Better database handling in Tcl Ian Jackson
2016-01-07 19:38 ` [OSSTEST PATCH 1/7] Tcl database debugging: Actually work Ian Jackson
2016-01-07 19:38 ` [OSSTEST PATCH 2/7] Database locking: Tcl: Use db-execute-array Ian Jackson
2016-01-07 19:38 ` Ian Jackson [this message]
2016-01-08 9:28 ` [OSSTEST PATCH 3/7] Database locking: Tcl: Use db-execute Ian Campbell
2016-01-12 15:38 ` Ian Jackson
2016-01-07 19:38 ` [OSSTEST PATCH 4/7] Database locking: Tcl: Always use db-execute-array for SELECT Ian Jackson
2016-01-07 19:38 ` [OSSTEST PATCH 5/7] Database locking: Tcl: for errorCode, use pg_exec, not pg_execute Ian Jackson
2016-01-08 9:32 ` Ian Campbell
2016-01-12 15:39 ` Ian Jackson
2016-01-14 10:33 ` Ian Campbell
2016-01-07 19:38 ` [OSSTEST PATCH 6/7] Database locking: Tcl: Retry only on DEADLOCK DETECTED Ian Jackson
2016-01-07 19:38 ` [OSSTEST PATCH 7/7] ms-ownerdaemon: Cope with db restart. Retry recording dead tasks Ian Jackson
2016-01-08 9:40 ` [OSSTEST PATCH 0/7] Better database handling in Tcl Ian Campbell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1452195496-16016-4-git-send-email-ian.jackson@eu.citrix.com \
--to=ian.jackson@eu.citrix.com \
--cc=ian.campbell@citrix.com \
--cc=xen-devel@lists.xenproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.