Skip to content

Commit fb9de7f

Browse files
committed
fix
1 parent b4e7418 commit fb9de7f

2 files changed

Lines changed: 6 additions & 3 deletions

File tree

modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -999,10 +999,12 @@ ClusterNode primary() {
999999
try {
10001000
cctx.io().send(backup, req, tx.ioPolicy());
10011001

1002-
if (salvageReq == null)
1003-
salvageReq = new GridDhtTxSalvageMessage(tx.xidVersion());
1002+
if (tx.storeWriteThrough()) {
1003+
if (salvageReq == null)
1004+
salvageReq = new GridDhtTxSalvageMessage(tx.xidVersion());
10041005

1005-
cctx.io().send(backup, salvageReq, tx.ioPolicy());
1006+
cctx.io().send(backup, salvageReq, tx.ioPolicy());
1007+
}
10061008
}
10071009
catch (ClusterTopologyCheckedException ignored) {
10081010
mini.onNodeLeft(backupId, discoThread);

modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1354,6 +1354,7 @@ private void processDhtTxSalvageRequest(GridDhtTxSalvageMessage req) {
13541354
// GridDhtTxLocal possible
13551355
if (active instanceof GridDhtTxRemote) {
13561356
ctx.tm().salvageTx(active);
1357+
break;
13571358
}
13581359
}
13591360
}

0 commit comments

Comments
 (0)