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

simonat2ndQuadrant · simonat2ndQuadrant · commit 8585ad362541 · 2011-01-31T19:20:23.000Z
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
diff --git 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.")));
 }

Original file line number	Diff line number	Diff line change
`@@ -494,7 +494,7 @@ CheckRecoveryConflictDeadlock(LWLockId partitionLock)`
`494`	`494`	`* process will continue to wait even though we have avoided deadlock.`
`495`	`495`	`*/`
`496`	`496`	`ereport(ERROR,`
`497`		`- (errcode(ERRCODE_QUERY_CANCELED),`
	`497`	`+ (errcode(ERRCODE_T_R_DEADLOCK_DETECTED),`
`498`	`498`	`errmsg("canceling statement due to conflict with recovery"),`
`499`	`499`	`errdetail("User transaction caused buffer deadlock with recovery.")));`
`500`	`500`	`}`