Merge branches 'ignite-gg-11729' and 'ignite-gg-8.0.2.ea1' of https://github.com/gridgain/apache-ignite into ignite-gg-11729
# Conflicts: # modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java Merge branches 'ignite-gg-11729' and 'ignite-gg-8.0.2.ea1' of https://github.com/ggprivate/ggprivate into ignite-gg-11729 # Conflicts: # modules/pds/src/main/java/org/gridgain/grid/internal/processors/cache/database/GridCacheDatabaseSharedManager.java Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/dffee01c Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/dffee01c Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/dffee01c Branch: refs/heads/ignite-3477 Commit: dffee01c54081d5a74ef50ec73bee1add0e8429e Parents: d4f3071 cbb9b9e Author: Ilya Lantukh <[email protected]> Authored: Tue Dec 20 23:32:15 2016 +0300 Committer: Ilya Lantukh <[email protected]> Committed: Tue Dec 20 23:32:15 2016 +0300 ---------------------------------------------------------------------- .gitignore | 34 +- bin/control.bat | 229 +++++ bin/control.sh | 180 ++++ .../rest/ChangeStateCommandHandlerTest.java | 125 +++ .../ignite/codegen/MessageCodeGenerator.java | 2 + .../src/main/java/org/apache/ignite/Ignite.java | 8 +- .../apache/ignite/IgniteCheckedException.java | 12 + .../apache/ignite/IgniteSystemProperties.java | 6 + .../apache/ignite/internal/GridComponent.java | 7 +- .../ignite/internal/GridKernalContext.java | 8 + .../ignite/internal/GridKernalContextImpl.java | 12 + .../ignite/internal/GridPluginComponent.java | 4 +- .../apache/ignite/internal/IgniteKernal.java | 116 ++- .../org/apache/ignite/internal/IgnitionEx.java | 2 +- .../ignite/internal/MarshallerContextImpl.java | 10 +- .../ignite/internal/client/GridClient.java | 9 + .../internal/client/GridClientClusterState.java | 33 + .../client/impl/GridClientClusterStateImpl.java | 75 ++ .../internal/client/impl/GridClientImpl.java | 11 + .../impl/connection/GridClientConnection.java | 17 + .../connection/GridClientNioTcpConnection.java | 21 + .../router/impl/GridRouterClientImpl.java | 6 + .../internal/commandline/CommandHandler.java | 89 ++ .../internal/managers/GridManagerAdapter.java | 2 +- .../checkpoint/GridCheckpointManager.java | 2 +- .../collision/GridCollisionManager.java | 2 +- .../managers/communication/GridIoManager.java | 2 +- .../communication/GridIoMessageFactory.java | 7 +- .../deployment/GridDeploymentManager.java | 2 +- .../discovery/GridDiscoveryManager.java | 7 +- .../eventstorage/GridEventStorageManager.java | 2 +- .../managers/failover/GridFailoverManager.java | 2 +- .../managers/indexing/GridIndexingManager.java | 2 +- .../loadbalancer/GridLoadBalancerManager.java | 2 +- .../pagemem/store/IgnitePageStoreManager.java | 3 +- .../pagemem/wal/IgniteWriteAheadLogManager.java | 3 +- .../wal/IgniteWriteAheadLogNoopManager.java | 11 + .../internal/pagemem/wal/record/WALRecord.java | 5 +- .../processors/GridProcessorAdapter.java | 4 +- .../affinity/GridAffinityProcessor.java | 2 +- .../cache/CacheAffinitySharedManager.java | 9 + .../internal/processors/cache/CacheState.java | 36 - .../cache/ChangeGlobalStateMessage.java | 120 +++ .../internal/processors/cache/ClusterState.java | 38 + .../cache/DynamicCacheChangeRequest.java | 23 +- .../GridCachePartitionExchangeManager.java | 18 +- .../processors/cache/GridCacheProcessor.java | 373 +++++--- .../GridChangeGlobalStateMessageResponse.java | 177 ++++ .../binary/CacheObjectBinaryProcessorImpl.java | 6 +- .../IgniteCacheDatabaseSharedManager.java | 28 +- .../cache/database/tree/io/TrackingPageIO.java | 19 +- .../distributed/dht/GridDhtLocalPartition.java | 3 +- .../dht/GridDhtPartitionTopologyImpl.java | 17 +- .../GridDhtPartitionsExchangeFuture.java | 122 ++- .../preloader/GridDhtPartitionsFullMessage.java | 72 +- .../GridDhtPartitionsSingleMessage.java | 70 +- .../dht/preloader/GridDhtPreloader.java | 3 +- .../clock/GridClockSyncProcessor.java | 8 +- .../closure/GridClosureProcessor.java | 2 +- .../processors/cluster/ClusterProcessor.java | 2 +- .../cluster/GridClusterStateProcessor.java | 933 +++++++++++++++++++ .../cluster/IgniteChangeGlobalStateSupport.java | 40 + .../continuous/GridContinuousProcessor.java | 2 +- .../datastreamer/DataStreamProcessor.java | 2 +- .../datastructures/DataStructuresProcessor.java | 129 ++- .../datastructures/GridCacheAtomicLongImpl.java | 14 +- .../GridCacheAtomicReferenceImpl.java | 16 +- .../GridCacheAtomicSequenceImpl.java | 14 +- .../GridCacheAtomicStampedImpl.java | 14 +- .../GridCacheCountDownLatchImpl.java | 14 +- .../datastructures/GridCacheLockImpl.java | 17 +- .../datastructures/GridCacheSemaphoreImpl.java | 14 +- .../internal/processors/igfs/IgfsProcessor.java | 4 +- .../processors/job/GridJobProcessor.java | 2 +- .../jobmetrics/GridJobMetricsProcessor.java | 2 +- .../internal/processors/odbc/OdbcProcessor.java | 11 +- .../platform/PlatformProcessorImpl.java | 2 +- .../plugin/IgnitePluginProcessor.java | 2 +- .../processors/port/GridPortProcessor.java | 2 +- .../processors/query/GridQueryProcessor.java | 4 +- .../resource/GridResourceProcessor.java | 2 +- .../processors/rest/GridRestCommand.java | 11 +- .../processors/rest/GridRestProcessor.java | 7 +- .../client/message/GridClientStateRequest.java | 80 ++ .../cluster/GridChangeStateCommandHandler.java | 89 ++ .../protocols/tcp/GridTcpRestNioListener.java | 20 + .../request/GridRestChangeStateRequest.java | 57 ++ .../service/GridServiceProcessor.java | 149 ++- .../session/GridTaskSessionProcessor.java | 2 +- .../processors/task/GridTaskProcessor.java | 4 +- .../timeout/GridTimeoutProcessor.java | 2 +- .../ignite/internal/util/IgniteUtils.java | 16 +- .../internal/util/OffheapReadWriteLock.java | 4 + .../org/apache/ignite/mxbean/IgniteMXBean.java | 21 + .../spi/discovery/tcp/TcpDiscoverySpi.java | 8 +- .../tcp/internal/TcpDiscoveryNode.java | 5 +- .../resources/META-INF/classnames.properties | 4 +- ...GridManagerLocalMessageListenerSelfTest.java | 8 +- .../managers/GridNoopManagerSelfTest.java | 2 +- .../pagemem/impl/PageMemoryNoLoadSelfTest.java | 2 +- .../cache/GridCacheAbstractFullApiSelfTest.java | 7 +- ...idCacheNearOnlyMultiNodeFullApiSelfTest.java | 2 +- ...cpCommunicationSpiMultithreadedSelfTest.java | 4 +- .../junits/GridTestKernalContext.java | 2 +- .../processors/hadoop/HadoopProcessor.java | 6 +- modules/platforms/.gitignore | 31 + .../schedule/IgniteScheduleProcessor.java | 2 +- 107 files changed, 3502 insertions(+), 505 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/dffee01c/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java index 8391f99,8c6cfa6..857c813 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java @@@ -34,8 -34,8 +34,9 @@@ import org.apache.ignite.internal.manag import org.apache.ignite.internal.managers.deployment.GridDeploymentResponse; import org.apache.ignite.internal.managers.eventstorage.GridEventStorageMessage; import org.apache.ignite.internal.pagemem.snapshot.SnapshotFinishedMessage; +import org.apache.ignite.internal.pagemem.snapshot.SnapshotProgressMessage; import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion; + import org.apache.ignite.internal.processors.cache.GridChangeGlobalStateMessageResponse; import org.apache.ignite.internal.processors.cache.CacheEntryInfoCollection; import org.apache.ignite.internal.processors.cache.CacheEntryPredicateContainsValue; import org.apache.ignite.internal.processors.cache.CacheEntrySerializablePredicate; @@@ -167,11 -167,10 +168,15 @@@ public class GridIoMessageFactory imple Message msg = null; switch (type) { - case -38: ++ case -39: + msg = new SnapshotProgressMessage(); + + break; + + case -38: + msg = new GridChangeGlobalStateMessageResponse(); + + break; case -37: msg = new GridDhtAtomicSingleUpdateRequest();
