git.postgresql.org Git - postgresql.git/commitdiff

git projects / postgresql.git / commitdiff

Fix error code for canceling statement due to conflict with recovery.

author Simon Riggs <simon@2ndQuadrant.com>

2011年1月31日 19:24:29 +0000 (19:24 +0000)

committer Simon Riggs <simon@2ndQuadrant.com>

2011年1月31日 19:24:29 +0000 (19:24 +0000)

All retryable conflict errors now have an error code that indicates that
a retry is possible, correcting my incomplete fix of 2010年05月12日

Tatsuo Ishii and Simon Riggs, input from Robert Haas and Florian Pflug

src/backend/storage/ipc/standby.c patch | blob | blame | history

diff --git a/src/backend/storage/ipc/standby.c b/src/backend/storage/ipc/standby.c

index 2f9fe8ab8eb46a04871cde9e0fffee770938f211..8ddfa60b388ae8ee6592cb854138896545034f0e 100644 (file)

--- a/src/backend/storage/ipc/standby.c

+++ b/src/backend/storage/ipc/standby.c

@@ -494,7 +494,7 @@ CheckRecoveryConflictDeadlock(LWLockId partitionLock)

* process will continue to wait even though we have avoided deadlock.

ereport(ERROR,

- (errcode(ERRCODE_QUERY_CANCELED),

+ (errcode(ERRCODE_T_R_DEADLOCK_DETECTED),

errmsg("canceling statement due to conflict with recovery"),

errdetail("User transaction caused buffer deadlock with recovery.")));

}

This is the main PostgreSQL git repository.

RSS Atom