ignite-1534 debug
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/879fcc9c Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/879fcc9c Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/879fcc9c Branch: refs/heads/ignite-1534 Commit: 879fcc9c18a0933a8910a7c837b8f1b0de92ece4 Parents: 9bc077e 52600f3 Author: sboikov <[email protected]> Authored: Wed Sep 30 15:48:54 2015 +0300 Committer: sboikov <[email protected]> Committed: Wed Sep 30 15:48:54 2015 +0300 ---------------------------------------------------------------------- .../apache/ignite/internal/IgniteKernal.java | 2 +- .../discovery/GridDiscoveryManager.java | 22 +-- .../processors/cache/GridCacheEventManager.java | 12 +- .../processors/cache/GridCacheIoManager.java | 76 +-------- .../processors/cache/GridCacheMessage.java | 7 - .../processors/cache/GridCacheProcessor.java | 68 +++++--- .../cache/GridCacheSharedContext.java | 32 ---- .../processors/cache/GridCacheUtils.java | 8 - .../dht/GridDhtAffinityAssignmentRequest.java | 5 - .../dht/GridDhtAffinityAssignmentResponse.java | 5 - .../distributed/dht/GridDhtLockRequest.java | 5 - .../distributed/dht/GridDhtTxFinishRequest.java | 5 - .../dht/GridDhtTxPrepareRequest.java | 7 +- .../dht/preloader/GridDhtForceKeysRequest.java | 5 - .../dht/preloader/GridDhtForceKeysResponse.java | 5 - .../GridDhtPartitionDemandMessage.java | 5 - .../GridDhtPartitionSupplyMessage.java | 5 - .../GridDhtPartitionsAbstractMessage.java | 5 - .../dht/preloader/GridDhtPreloader.java | 6 + .../IgniteClientReconnectAbstractTest.java | 35 ++++- .../IgniteClientReconnectCacheTest.java | 154 +++++++++++++++++++ .../IgniteCacheP2pUnmarshallingErrorTest.java | 7 + ...CacheP2pUnmarshallingRebalanceErrorTest.java | 12 +- .../dht/IgniteCrossCacheTxSelfTest.java | 6 +- 24 files changed, 270 insertions(+), 229 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/879fcc9c/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java index f977d92,aec36a2..a6dbfc9 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java @@@ -465,16 -465,6 +465,8 @@@ public class GridDiscoveryManager exten final Map<Long, Collection<ClusterNode>> snapshots, @Nullable DiscoverySpiCustomMessage spiCustomMsg ) { + U.sleep(); + - if (type == EVT_NODE_JOINED && node.isLocal() && ctx.clientDisconnected()) { - discoCacheHist.clear(); - - topHist.clear(); - - topSnap.set(new Snapshot(AffinityTopologyVersion.ZERO, null)); - } - DiscoveryCustomMessage customMsg = spiCustomMsg == null ? null : ((CustomMessageWrapper)spiCustomMsg).delegate(); http://git-wip-us.apache.org/repos/asf/ignite/blob/879fcc9c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java ----------------------------------------------------------------------
