Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit17d3fcd

Browse files
committed
Fix bug that causes to report waiting in PS display twice, in hot standby.
Previously "waiting" could appear twice via PS in case of lock conflictin hot standby mode. Specifically this issue happend when the delayin WAL application determined by max_standby_archive_delay andmax_standby_streaming_delay had passed but it took more than 500 msecto cancel all the conflicting transactions. Especially we can observe thiseasily by setting those delay parameters to -1.The cause of this issue was that WaitOnLock() andResolveRecoveryConflictWithVirtualXIDs() added "waiting" tothe process title in that case. This commit preventsResolveRecoveryConflictWithVirtualXIDs() from reporting waitingin case of lock conflict, to fix the bug.Back-patch to all back branches.Author: Masahiko SawadaReviewed-by: Fujii MasaoDiscussion:https://postgr.es/m/CA+fd4k4mXWTwfQLS3RPwGr4xnfAEs1ysFfgYHvmmoUgv6Zxvmg@mail.gmail.com
1 parent71d60e2 commit17d3fcd

File tree

1 file changed

+22
-8
lines changed

1 file changed

+22
-8
lines changed

‎src/backend/storage/ipc/standby.c

Lines changed: 22 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ intmax_standby_streaming_delay = 30 * 1000;
4343
staticHTAB*RecoveryLockLists;
4444

4545
staticvoidResolveRecoveryConflictWithVirtualXIDs(VirtualTransactionId*waitlist,
46-
ProcSignalReasonreason);
46+
ProcSignalReasonreason,boolreport_waiting);
4747
staticvoidSendRecoveryConflictWithBufferPin(ProcSignalReasonreason);
4848
staticXLogRecPtrLogCurrentRunningXacts(RunningTransactionsCurrRunningXacts);
4949
staticvoidLogAccessExclusiveLocks(intnlocks,xl_standby_lock*locks);
@@ -216,19 +216,24 @@ WaitExceedsMaxStandbyDelay(void)
216216
* recovery processing. Judgement has already been passed on it within
217217
* a specific rmgr. Here we just issue the orders to the procs. The procs
218218
* then throw the required error as instructed.
219+
*
220+
* If report_waiting is true, "waiting" is reported in PS display if necessary.
221+
* If the caller has already reported that, report_waiting should be false.
222+
* Otherwise, "waiting" is reported twice unexpectedly.
219223
*/
220224
staticvoid
221225
ResolveRecoveryConflictWithVirtualXIDs(VirtualTransactionId*waitlist,
222-
ProcSignalReasonreason)
226+
ProcSignalReasonreason,boolreport_waiting)
223227
{
224-
TimestampTzwaitStart;
228+
TimestampTzwaitStart=0;
225229
char*new_status;
226230

227231
/* Fast exit, to avoid a kernel call if there's no work to be done. */
228232
if (!VirtualTransactionIdIsValid(*waitlist))
229233
return;
230234

231-
waitStart=GetCurrentTimestamp();
235+
if (report_waiting)
236+
waitStart=GetCurrentTimestamp();
232237
new_status=NULL;/* we haven't changed the ps display */
233238

234239
while (VirtualTransactionIdIsValid(*waitlist))
@@ -243,7 +248,7 @@ ResolveRecoveryConflictWithVirtualXIDs(VirtualTransactionId *waitlist,
243248
* Report via ps if we have been waiting for more than 500 msec
244249
* (should that be configurable?)
245250
*/
246-
if (update_process_title&&new_status==NULL&&
251+
if (update_process_title&&new_status==NULL&&report_waiting&&
247252
TimestampDifferenceExceeds(waitStart,GetCurrentTimestamp(),
248253
500))
249254
{
@@ -311,7 +316,8 @@ ResolveRecoveryConflictWithSnapshot(TransactionId latestRemovedXid, RelFileNode
311316
node.dbNode);
312317

313318
ResolveRecoveryConflictWithVirtualXIDs(backends,
314-
PROCSIG_RECOVERY_CONFLICT_SNAPSHOT);
319+
PROCSIG_RECOVERY_CONFLICT_SNAPSHOT,
320+
true);
315321
}
316322

317323
void
@@ -339,7 +345,8 @@ ResolveRecoveryConflictWithTablespace(Oid tsid)
339345
temp_file_users=GetConflictingVirtualXIDs(InvalidTransactionId,
340346
InvalidOid);
341347
ResolveRecoveryConflictWithVirtualXIDs(temp_file_users,
342-
PROCSIG_RECOVERY_CONFLICT_TABLESPACE);
348+
PROCSIG_RECOVERY_CONFLICT_TABLESPACE,
349+
true);
343350
}
344351

345352
void
@@ -402,8 +409,15 @@ ResolveRecoveryConflictWithLock(LOCKTAG locktag)
402409
VirtualTransactionId*backends;
403410

404411
backends=GetLockConflicts(&locktag,AccessExclusiveLock,NULL);
412+
413+
/*
414+
* Prevent ResolveRecoveryConflictWithVirtualXIDs() from reporting
415+
* "waiting" in PS display by disabling its argument report_waiting
416+
* because the caller, WaitOnLock(), has already reported that.
417+
*/
405418
ResolveRecoveryConflictWithVirtualXIDs(backends,
406-
PROCSIG_RECOVERY_CONFLICT_LOCK);
419+
PROCSIG_RECOVERY_CONFLICT_LOCK,
420+
false);
407421
}
408422
else
409423
{

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp