This is an automated email from the ASF dual-hosted git repository.
av pushed a commit to branch ignite-20177
in repository https://gitbox.apache.org/repos/asf/ignite.git
commit 77f664db925cbca47a92f779ab26f9f647089fc6
Author: Anton Vinogradov <a...@apache.org>
AuthorDate: Tue Aug 8 16:29:19 2023 +0300
WIP
---
.../cache/distributed/dht/GridDhtTxFinishFuture.java | 17 ++++-------------
1 file changed, 4 insertions(+), 13 deletions(-)
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishFuture.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishFuture.java
index a1c9c168c72..8330d80ba98 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishFuture.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishFuture.java
@@ -315,7 +315,6 @@ public final class GridDhtTxFinishFuture<K, V> extends
GridCacheCompoundIdentity
*
* @param commit Commit flag.
*/
- @SuppressWarnings({"SimplifiableIfStatement"})
public void finish(boolean commit) {
try (MTC.TraceSurroundings ignored =
MTC.supportContinual(span =
cctx.kernalContext().tracing().create(TX_DHT_FINISH, MTC.span()))) {
@@ -408,7 +407,7 @@ public final class GridDhtTxFinishFuture<K, V> extends
GridCacheCompoundIdentity
catch (IgniteCheckedException e) {
// Fail the whole thing.
if (e instanceof ClusterTopologyCheckedException)
- fut.onNodeLeft((ClusterTopologyCheckedException)e);
+ fut.onNodeLeft();
else {
if (msgLog.isDebugEnabled()) {
msgLog.debug("DHT finish fut, failed to send request
lock tx [txId=" + tx.nearXidVersion() +
@@ -504,8 +503,7 @@ public final class GridDhtTxFinishFuture<K, V> extends
GridCacheCompoundIdentity
if (isNull(cctx.discovery().getAlive(n.id()))) {
log.error("Unable to send message (node left topology): "
+ n);
- fut.onNodeLeft(new ClusterTopologyCheckedException("Node
left grid while sending message to: "
- + n.id()));
+ fut.onNodeLeft();
}
else {
cctx.tm().sendTransactionMessage(n, req, tx,
tx.ioPolicy());
@@ -525,7 +523,7 @@ public final class GridDhtTxFinishFuture<K, V> extends
GridCacheCompoundIdentity
catch (IgniteCheckedException e) {
// Fail the whole thing.
if (e instanceof ClusterTopologyCheckedException)
- fut.onNodeLeft((ClusterTopologyCheckedException)e);
+ fut.onNodeLeft();
else {
if (msgLog.isDebugEnabled()) {
msgLog.debug("DHT finish fut, failed to send request
dht [txId=" + tx.nearXidVersion() +
@@ -595,7 +593,7 @@ public final class GridDhtTxFinishFuture<K, V> extends
GridCacheCompoundIdentity
catch (IgniteCheckedException e) {
// Fail the whole thing.
if (e instanceof ClusterTopologyCheckedException)
- fut.onNodeLeft((ClusterTopologyCheckedException)e);
+ fut.onNodeLeft();
else {
if (msgLog.isDebugEnabled()) {
msgLog.debug("DHT finish fut, failed to send
request near [txId=" + tx.nearXidVersion() +
@@ -747,13 +745,6 @@ public final class GridDhtTxFinishFuture<K, V> extends
GridCacheCompoundIdentity
onDone(e);
}
- /**
- * @param e Node failure.
- */
- void onNodeLeft(ClusterTopologyCheckedException e) {
- onNodeLeft();
- }
-
/**
*/
void onNodeLeft() {
