From 845d335a90b684dd51e80a6470ebb923a59a1f91 Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Tue, 2 Apr 2013 21:15:37 -0400 Subject: [PATCH] Minor robustness improvements for isolationtester. Notice and complain about PQcancel() failures. Also, don't dump core if an error PGresult doesn't contain severity and message subfields, as it might not if it was generated by libpq itself. (We have a longstanding TODO item to improve that, but in the meantime isolationtester had better cope.) I tripped across the latter item while investigating a trouble report on buildfarm member spoonbill. As for the former, there's no evidence that PQcancel failure is actually involved in spoonbill's problem, but it still seems like a bad idea to ignore an error return code. --- src/test/isolation/isolationtester.c | 31 ++++++++++++++++++++-------- 1 file changed, 22 insertions(+), 9 deletions(-) diff --git a/src/test/isolation/isolationtester.c b/src/test/isolation/isolationtester.c index 9776df270a9..c61d54c51f8 100644 --- a/src/test/isolation/isolationtester.c +++ b/src/test/isolation/isolationtester.c @@ -578,7 +578,8 @@ run_permutation(TestSpec * testspec, int nsteps, Step ** steps) { char buf[256]; - PQcancel(cancel, buf, sizeof(buf)); + if (!PQcancel(cancel, buf, sizeof(buf))) + fprintf(stderr, "PQcancel failed: %s\n", buf); /* Be sure to consume the error message. */ while ((res = PQgetResult(conn)) != NULL) @@ -771,14 +772,26 @@ try_complete_step(Step * step, int flags) printf("WARNING: this step had a leftover error message\n"); printf("%s\n", step->errormsg); } - /* Detail may contain xid values, so just show primary. */ - step->errormsg = malloc(5 + - strlen(PQresultErrorField(res, PG_DIAG_SEVERITY)) + - strlen(PQresultErrorField(res, - PG_DIAG_MESSAGE_PRIMARY))); - sprintf(step->errormsg, "%s: %s", - PQresultErrorField(res, PG_DIAG_SEVERITY), - PQresultErrorField(res, PG_DIAG_MESSAGE_PRIMARY)); + + /* + * Detail may contain XID values, so we want to just show + * primary. Beware however that libpq-generated error results + * may not contain subfields, only an old-style message. + */ + { + const char *sev = PQresultErrorField(res, + PG_DIAG_SEVERITY); + const char *msg = PQresultErrorField(res, + PG_DIAG_MESSAGE_PRIMARY); + + if (sev && msg) + { + step->errormsg = malloc(5 + strlen(sev) + strlen(msg)); + sprintf(step->errormsg, "%s: %s", sev, msg); + } + else + step->errormsg = strdup(PQresultErrorMessage(res)); + } break; default: printf("unexpected result status: %s\n",