Skip to content

Commit 46abfdc

Browse files
committed
IGNITE-24963 Test with WD
1 parent d035a84 commit 46abfdc

1 file changed

Lines changed: 25 additions & 17 deletions

File tree

modules/transactions/src/main/java/org/apache/ignite/internal/tx/impl/TxManagerImpl.java

Lines changed: 25 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1035,27 +1035,35 @@ public void processDelayedAck(Object ignored, @Nullable Throwable err) {
10351035

10361036
@Override
10371037
public CompletableFuture<Void> startAsync(ComponentContext componentContext) {
1038-
var deadlockPreventionPolicy = new WoundWaitDeadlockPreventionPolicy() {
1038+
// var deadlockPreventionPolicy = new WoundWaitDeadlockPreventionPolicy() {
1039+
// @Override
1040+
// public long waitTimeout() {
1041+
// return DEFAULT_LOCK_TIMEOUT;
1042+
// }
1043+
//
1044+
// @Override
1045+
// public void failAction(UUID owner) {
1046+
// // TODO IGNITE-28447 sendTxRecoveryMessage and delete locks.
1047+
// TxStateMeta state = txStateVolatileStorage.state(owner);
1048+
// if (state == null || state.txCoordinatorId() == null) {
1049+
// return; // Tx state is invalid. Locks will be cleaned up by tx recovery process.
1050+
// }
1051+
//
1052+
// InternalClusterNode coordinator = topologyService.getById(state.txCoordinatorId());
1053+
// if (coordinator == null) {
1054+
// return; // Tx is abandoned. Locks will be cleaned up by tx recovery process.
1055+
// }
1056+
//
1057+
// txMessageSender.kill(coordinator, owner);
1058+
// }
1059+
// };
1060+
1061+
// This commented section is left intentionally.
1062+
var deadlockPreventionPolicy = new WaitDieDeadlockPreventionPolicy() {
10391063
@Override
10401064
public long waitTimeout() {
10411065
return DEFAULT_LOCK_TIMEOUT;
10421066
}
1043-
1044-
@Override
1045-
public void failAction(UUID owner) {
1046-
// TODO IGNITE-28447 sendTxRecoveryMessage and delete locks.
1047-
TxStateMeta state = txStateVolatileStorage.state(owner);
1048-
if (state == null || state.txCoordinatorId() == null) {
1049-
return; // Tx state is invalid. Locks will be cleaned up by tx recovery process.
1050-
}
1051-
1052-
InternalClusterNode coordinator = topologyService.getById(state.txCoordinatorId());
1053-
if (coordinator == null) {
1054-
return; // Tx is abandoned. Locks will be cleaned up by tx recovery process.
1055-
}
1056-
1057-
txMessageSender.kill(coordinator, owner);
1058-
}
10591067
};
10601068

10611069
txStateVolatileStorage.start();

0 commit comments

Comments
 (0)