Repository: ignite Updated Branches: refs/heads/master 722c49391 -> 44fd019d0
ignite-5510 Remove assert from removeTxReturn - removeTxReturn can be called concurrently from processDhtTxOnePhaseCommitAckRequest and node fail handler - it is possible client acks tx but it did not start on backup since partition was evicted (0 backups cache) Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/44fd019d Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/44fd019d Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/44fd019d Branch: refs/heads/master Commit: 44fd019d0a06d27ce9e9cb760447a11377a19837 Parents: 722c493 Author: sboikov <sboi...@apache.org> Authored: Fri Jul 27 17:00:31 2018 +0300 Committer: sboikov <sboi...@apache.org> Committed: Fri Jul 27 17:00:31 2018 +0300 ---------------------------------------------------------------------- .../processors/cache/transactions/IgniteTxManager.java | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/44fd019d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java index a30ca04..ec9a5c4 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java @@ -1092,15 +1092,8 @@ public class IgniteTxManager extends GridCacheSharedManagerAdapter { public void removeTxReturn(GridCacheVersion xidVer) { Object prev = completedVersHashMap.get(xidVer); - if (Boolean.FALSE.equals(prev)) // Tx can be rolled back. - return; - - assert prev instanceof GridCacheReturnCompletableWrapper: - prev + " instead of GridCacheReturnCompletableWrapper"; - - boolean res = completedVersHashMap.replace(xidVer, prev, true); - - assert res; + if (prev instanceof GridCacheReturnCompletableWrapper) + completedVersHashMap.replace(xidVer, prev, true); } /**
