[Xen-devel] [OSSTEST PATCH 20/33] tcl daemons: jobdb::transaction: Improve two message generation sites

[Ian Jackson <ian.jackson@xxxxxxxxxxxxx>]

* Use logputs rather than puts to report transaction deadlock retry

* Use $ei and $ec rather than $errorInfo and $errorCode when calling
  error due to too many deadlock retries.  This has no functional change
  but is less fragile in case of future addition of new calls to catch
  between the main catch and this throw.

Signed-off-by: Ian Jackson <Ian.Jackson@xxxxxxxxxxxxx>
---
 tcl/JobDB-Executive.tcl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tcl/JobDB-Executive.tcl b/tcl/JobDB-Executive.tcl
index f2322c4..c1e5c63 100644
--- a/tcl/JobDB-Executive.tcl
+++ b/tcl/JobDB-Executive.tcl
@@ -298,10 +298,10 @@ proc transaction {tables script} {
            switch -glob $errorCode {
                {OSSTEST-PSQL * 40P01} {
                    # DEADLOCK DETECTED
-                   puts "transaction deadlock ($result) retrying ..."
+                   logputs stdout "transaction deadlock ($result) retrying ..."
                    if {[incr retries -1] <= 0} {
                        error \
- "transaction failed, too many retries: $result\n$errorInfo\n$errorCode\n"
+ "transaction failed, too many retries: $result\n$ei\n$ec\n"
                    }
                    after 500
                    continue
-- 
2.1.4


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
https://lists.xen.org/xen-devel