ExchangeFuture will not complete with Exception on state change failure - Fixes
@@ -3440,8 +3440,6 @@ public class GridDhtPartitionsExchangeFuture extends GridDhtTopologyFutureAdapte
}
if (stateChangeExchange()) {
- IgniteCheckedException err = null;
-
StateChangeRequest req = exchActions.stateChangeRequest();
assert req != null : exchActions;
@@ -3451,8 +3449,6 @@ public class GridDhtPartitionsExchangeFuture extends GridDhtTopologyFutureAdapte
if (!F.isEmpty(exchangeGlobalExceptions)) {
stateChangeErr = true;
- err = new IgniteCheckedException("Cluster state change failed.");
-
cctx.kernalContext().state().onStateChangeError(exchangeGlobalExceptions, req);
}
else {
@@ -3484,7 +3480,7 @@ public class GridDhtPartitionsExchangeFuture extends GridDhtTopologyFutureAdapte
cctx.discovery().sendCustomEvent(stateFinishMsg);
if (!centralizedAff)
- onDone(exchCtx.events().topologyVersion(), err);
+ onDone(exchCtx.events().topologyVersion(), null);
}
}
catch (IgniteCheckedException e) {
@@ -3969,15 +3965,10 @@ public class GridDhtPartitionsExchangeFuture extends GridDhtTopologyFutureAdapte
updatePartitionFullMap(resTopVer, msg);
- IgniteCheckedException err = null;
-
- if (stateChangeExchange() && !F.isEmpty(msg.getErrorsMap())) {
- err = new IgniteCheckedException("Cluster state change failed");
-
+ if (stateChangeExchange() && !F.isEmpty(msg.getErrorsMap()))
cctx.kernalContext().state().onStateChangeError(msg.getErrorsMap(), exchActions.stateChangeRequest());
- }
- onDone(resTopVer, err);
+ onDone(resTopVer, null);
}
catch (IgniteCheckedException e) {
onDone(e);
