diff --git a/src/backend/access/transam/xact.c b/src/backend/access/transam/xact.c index ede77c8608df313ba88df58b2ab6041651050ab0..6dbd5c949798ea1fe54aa54f8d9803aa05c69992 100644 --- a/src/backend/access/transam/xact.c +++ b/src/backend/access/transam/xact.c @@ -3432,16 +3432,8 @@ CommitTransaction(void) if (willHaveObjectsFromSmgr) { /* - * We need to ensure the recording of the [distributed-]commit record and the - * persistent post-commit work will be done either before or after a checkpoint. - * - * When we use CheckpointStartLock, we make sure we already have the - * MirroredLock first. - * - * GPDB_83_MERGE_FIXME: we no longer need to worry about deadlock between - * CheckpointStartLock and MirroredLock, as CheckpointStartLock is no longer - * a lwlock but just a flag, MyProc->inCommit. Do we still need to grab - * MirroredLock? + * This is to protect access to counter fileRepResyncShmem->appendOnlyCommitCount + * and FileRepResyncManager_InResyncTransition() */ MIRRORED_LOCK; } @@ -4018,13 +4010,8 @@ AbortTransaction(void) if (willHaveObjectsFromSmgr) { /* - * We need to ensure the recording of the abort record and the - * persistent post-abort work will be done either before or after a checkpoint. - * - * When we use CheckpointStartLock, we make sure we already have the - * MirroredLock first. - * - * GPDB_83_MERGE_FIXME: see comments in CommitTransaction() + * This is to protect access to counter fileRepResyncShmem->appendOnlyCommitCount + * and FileRepResyncManager_InResyncTransition() */ MIRRORED_LOCK; }