File tree Expand file tree Collapse file tree 1 file changed +11
-3
lines changed Expand file tree Collapse file tree 1 file changed +11
-3
lines changed Original file line number Diff line number Diff line change @@ -2662,11 +2662,19 @@ void ReplicationCoordinatorImpl::_killConflictingOpsOnStepUpAndStepDown(
2662
2662
// Don't kill step up/step down thread.
2663
2663
if (toKill && !toKill->isKillPending () && toKill->getOpID () != rstlOpCtx->getOpID ()) {
2664
2664
auto locker = toKill->lockState ();
2665
- if (toKill->shouldAlwaysInterruptAtStepDownOrUp () ||
2666
- locker->wasGlobalLockTakenInModeConflictingWithWrites () ||
2667
- PrepareConflictTracker::get (toKill).isWaitingOnPrepareConflict ()) {
2665
+ bool alwaysInterrupt = toKill->shouldAlwaysInterruptAtStepDownOrUp ();
2666
+ bool globalLockConfict = locker->wasGlobalLockTakenInModeConflictingWithWrites ();
2667
+ bool isWaitingOnPrepareConflict =
2668
+ PrepareConflictTracker::get (toKill).isWaitingOnPrepareConflict ();
2669
+ if (alwaysInterrupt || globalLockConfict || isWaitingOnPrepareConflict) {
2668
2670
serviceCtx->killOperation (lk, toKill, reason);
2669
2671
arsc->incrementUserOpsKilled ();
2672
+ LOGV2 (8562701 ,
2673
+ " Repl state change interrupted a thread." ,
2674
+ " name" _attr = client->desc (),
2675
+ " alwaysInterrupt" _attr = alwaysInterrupt,
2676
+ " globalLockConflict" _attr = globalLockConfict,
2677
+ " isWaitingOnPrepareConflict" _attr = isWaitingOnPrepareConflict);
2670
2678
} else {
2671
2679
arsc->incrementUserOpsRunning ();
2672
2680
}
You can’t perform that action at this time.
0 commit comments