Repository: ignite Updated Branches: refs/heads/master a3b624d9f -> 177d571b5
IGNITE-9155 ExchangeFuture will not complete with Exception on state change failure - Fixes #4467. Signed-off-by: Alexey Goncharuk <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/177d571b Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/177d571b Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/177d571b Branch: refs/heads/master Commit: 177d571b57f8dde2c82e2a7e4ba9b5d453f4d8df Parents: a3b624d Author: Ilya Lantukh <[email protected]> Authored: Thu Oct 18 19:34:55 2018 +0300 Committer: Alexey Goncharuk <[email protected]> Committed: Thu Oct 18 19:34:55 2018 +0300 ---------------------------------------------------------------------- .../preloader/GridDhtPartitionsExchangeFuture.java | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/177d571b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java index 0fe1a25..4b4b6df 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java @@ -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);
