Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 69D25200CE4 for ; Thu, 6 Jul 2017 10:04:19 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 68D11165B66; Thu, 6 Jul 2017 08:04:19 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 49286165B68 for ; Thu, 6 Jul 2017 10:04:18 +0200 (CEST) Received: (qmail 91768 invoked by uid 500); 6 Jul 2017 08:04:17 -0000 Mailing-List: contact commits-help@ignite.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.apache.org Delivered-To: mailing list commits@ignite.apache.org Received: (qmail 91689 invoked by uid 99); 6 Jul 2017 08:04:17 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 06 Jul 2017 08:04:17 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 90F1CF3220; Thu, 6 Jul 2017 08:04:16 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sboikov@apache.org To: commits@ignite.apache.org Date: Thu, 06 Jul 2017 08:04:24 -0000 Message-Id: In-Reply-To: <4eeb8b22a82549068d764dbc8421e2f8@git.apache.org> References: <4eeb8b22a82549068d764dbc8421e2f8@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [09/21] ignite git commit: Merge branch 'ignite-2.1' into ignite-2.1.2-merge-ea11 archived-at: Thu, 06 Jul 2017 08:04:19 -0000 Merge branch 'ignite-2.1' into ignite-2.1.2-merge-ea11 # Conflicts: # modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/f4ad01b7 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/f4ad01b7 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/f4ad01b7 Branch: refs/heads/ignite-gg-12306-1 Commit: f4ad01b7a768e0d4603d00509aabdab62525d8c8 Parents: b223076 b67b8c4 Author: Ivan Rakov Authored: Wed Jul 5 12:46:01 2017 +0300 Committer: Ivan Rakov Committed: Wed Jul 5 12:46:01 2017 +0300 ---------------------------------------------------------------------- .../PersistentStoreConfiguration.java | 39 +- .../org/apache/ignite/events/EventType.java | 12 + .../ignite/events/WalSegmentArchivedEvent.java | 62 + .../apache/ignite/internal/GridComponent.java | 4 +- .../ignite/internal/GridPluginComponent.java | 2 +- .../apache/ignite/internal/IgniteKernal.java | 33 +- .../internal/jdbc/thin/JdbcThinConnection.java | 7 +- .../internal/managers/GridManagerAdapter.java | 2 +- .../internal/managers/discovery/DiscoCache.java | 17 +- .../discovery/DiscoveryLocalJoinData.java | 104 ++ .../discovery/GridDiscoveryManager.java | 128 +- .../pagemem/store/IgnitePageStoreManager.java | 3 +- .../internal/pagemem/wal/record/WALRecord.java | 11 +- .../processors/GridProcessorAdapter.java | 2 +- .../cache/CacheAffinitySharedManager.java | 67 +- .../processors/cache/CacheGroupContext.java | 4 +- .../processors/cache/CacheGroupData.java | 4 +- .../cache/ChangeGlobalStateMessage.java | 120 -- .../processors/cache/ClusterCachesInfo.java | 490 +++++-- .../internal/processors/cache/ClusterState.java | 38 - .../cache/DynamicCacheChangeRequest.java | 52 +- .../processors/cache/ExchangeActions.java | 37 +- .../processors/cache/GridCacheEventManager.java | 2 - .../cache/GridCacheEvictionManager.java | 1 - .../processors/cache/GridCacheIoManager.java | 13 +- .../processors/cache/GridCacheMvccManager.java | 9 +- .../GridCachePartitionExchangeManager.java | 423 +++--- .../processors/cache/GridCacheProcessor.java | 177 ++- .../cache/GridCacheSharedContext.java | 60 +- .../cache/GridCacheSharedManager.java | 6 - .../cache/GridCacheSharedManagerAdapter.java | 16 - .../processors/cache/PendingDiscoveryEvent.java | 61 + .../processors/cache/StateChangeRequest.java | 77 ++ .../binary/CacheObjectBinaryProcessorImpl.java | 4 +- .../distributed/GridCacheTxRecoveryFuture.java | 1 - .../distributed/dht/GridDhtCacheAdapter.java | 1 - .../cache/distributed/dht/GridDhtGetFuture.java | 1 - .../distributed/dht/GridDhtGetSingleFuture.java | 2 - .../dht/GridDhtPartitionTopologyImpl.java | 13 +- .../dht/GridDhtTopologyFutureAdapter.java | 2 +- .../dht/GridPartitionedSingleGetFuture.java | 3 - .../GridNearAtomicAbstractUpdateFuture.java | 1 - .../dht/preloader/GridDhtForceKeysFuture.java | 1 - .../dht/preloader/GridDhtPartitionDemander.java | 2 + .../GridDhtPartitionsExchangeFuture.java | 228 +++- .../preloader/GridDhtPartitionsFullMessage.java | 44 +- .../GridDhtPartitionsSingleMessage.java | 38 +- .../dht/preloader/GridDhtPreloader.java | 2 +- .../distributed/near/GridNearGetFuture.java | 2 - .../near/GridNearTxPrepareRequest.java | 1 - .../GridCacheDatabaseSharedManager.java | 105 +- .../persistence/GridCacheOffheapManager.java | 5 +- .../IgniteCacheDatabaseSharedManager.java | 74 +- .../persistence/IgniteCacheSnapshotManager.java | 12 +- .../persistence/file/FilePageStoreManager.java | 14 +- .../wal/AbstractWalRecordsIterator.java | 289 ++++ .../cache/persistence/wal/FileInput.java | 16 +- .../cache/persistence/wal/FileWALPointer.java | 4 +- .../wal/FileWriteAheadLogManager.java | 594 ++++---- .../cache/persistence/wal/RecordSerializer.java | 5 + .../persistence/wal/SegmentArchiveResult.java | 61 + .../persistence/wal/SegmentEofException.java | 3 +- .../wal/reader/IgniteWalIteratorFactory.java | 102 ++ .../wal/reader/StandaloneGridKernalContext.java | 499 +++++++ ...ndaloneIgniteCacheDatabaseSharedManager.java | 30 + .../reader/StandaloneWalRecordsIterator.java | 258 ++++ .../wal/serializer/RecordV1Serializer.java | 45 +- .../query/GridCacheDistributedQueryManager.java | 4 +- .../store/GridCacheStoreManagerAdapter.java | 1 - .../cache/version/GridCacheVersionManager.java | 6 - .../cacheobject/IgniteCacheObjectProcessor.java | 5 - .../IgniteCacheObjectProcessorImpl.java | 5 - .../cluster/ChangeGlobalStateFinishMessage.java | 86 ++ .../cluster/ChangeGlobalStateMessage.java | 140 ++ .../processors/cluster/ClusterProcessor.java | 3 +- .../cluster/DiscoveryDataClusterState.java | 157 +++ .../cluster/GridClusterStateProcessor.java | 1122 ++++++--------- .../cluster/IgniteChangeGlobalStateSupport.java | 3 +- .../datastructures/DataStructuresProcessor.java | 6 +- .../datastructures/GridCacheAtomicLongImpl.java | 2 +- .../GridCacheAtomicReferenceImpl.java | 2 +- .../GridCacheAtomicSequenceImpl.java | 2 +- .../GridCacheAtomicStampedImpl.java | 2 +- .../GridCacheCountDownLatchImpl.java | 2 +- .../datastructures/GridCacheLockImpl.java | 4 +- .../datastructures/GridCacheQueueAdapter.java | 1 - .../datastructures/GridCacheSemaphoreImpl.java | 2 +- .../datastructures/GridCacheSetImpl.java | 1 - .../internal/processors/igfs/IgfsImpl.java | 2 - .../internal/processors/igfs/IgfsProcessor.java | 2 +- .../processors/query/GridQueryProcessor.java | 4 +- .../processors/rest/GridRestProcessor.java | 2 +- .../cluster/GridChangeStateCommandHandler.java | 2 +- .../service/GridServiceProcessor.java | 6 +- .../processors/task/GridTaskProcessor.java | 2 +- .../ignite/spi/discovery/tcp/ClientImpl.java | 12 +- .../ignite/spi/discovery/tcp/ServerImpl.java | 10 +- .../internal/TestRecordingCommunicationSpi.java | 10 + ...GridManagerLocalMessageListenerSelfTest.java | 4 +- ...unicationBalanceMultipleConnectionsTest.java | 5 + .../cache/GridCacheAbstractMetricsSelfTest.java | 24 - .../cache/IgniteActiveClusterTest.java | 182 --- .../IgniteClusterActivateDeactivateTest.java | 1284 ++++++++++++++++++ ...erActivateDeactivateTestWithPersistence.java | 197 +++ .../IgniteDaemonNodeMarshallerCacheTest.java | 10 - .../IgniteSemaphoreAbstractSelfTest.java | 17 +- ...IgnitePersistentStoreDataStructuresTest.java | 2 + .../wal/IgniteWalHistoryReservationsTest.java | 2 +- .../db/wal/reader/IgniteWalReaderTest.java | 385 ++++++ .../db/wal/reader/MockWalIteratorFactory.java | 114 ++ .../pagemem/NoOpPageStoreManager.java | 12 +- .../persistence/pagemem/NoOpWALManager.java | 23 +- .../AbstractNodeJoinTemplate.java | 149 +- .../IgniteChangeGlobalStateAbstractTest.java | 65 +- .../IgniteChangeGlobalStateCacheTest.java | 2 +- ...IgniteChangeGlobalStateDataStreamerTest.java | 5 +- ...gniteChangeGlobalStateDataStructureTest.java | 6 +- .../IgniteChangeGlobalStateFailOverTest.java | 26 +- .../IgniteChangeGlobalStateTest.java | 158 +-- .../IgniteStandByClusterTest.java | 17 +- .../join/JoinActiveNodeToActiveCluster.java | 62 +- ...ctiveNodeToActiveClusterWithPersistence.java | 17 + .../IgniteStandByClientReconnectTest.java | 13 +- ...eStandByClientReconnectToNewClusterTest.java | 13 +- ...cpCommunicationSpiMultithreadedSelfTest.java | 2 +- .../testframework/junits/GridAbstractTest.java | 4 +- .../junits/common/GridCommonAbstractTest.java | 3 + .../ignite/testsuites/IgnitePdsTestSuite2.java | 9 +- .../testsuites/IgniteStandByClusterSuite.java | 5 +- .../processors/hadoop/HadoopProcessor.java | 4 +- ...ileSystemShmemExternalDualAsyncSelfTest.java | 5 + .../cache/IgniteCacheAbstractQuerySelfTest.java | 3 +- .../spark/JavaEmbeddedIgniteRDDSelfTest.java | 5 + 133 files changed, 6410 insertions(+), 2577 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/f4ad01b7/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java index f4524ef,624dec0..716482e --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java @@@ -2122,12 -2107,9 +2107,12 @@@ public class GridCacheProcessor extend if (exchActions == null) return; - if (exchActions.systemCachesStarting() && exchActions.newClusterState() == null) { - if (exchActions.systemCachesStarting() && exchActions.stateChangeRequest() == null) ++ if (exchActions.systemCachesStarting() && exchActions.stateChangeRequest() == null) { ctx.dataStructures().restoreStructuresState(ctx); + ctx.service().updateUtilityCache(); + } + if (err == null) { // Force checkpoint if there is any cache stop request if (exchActions.cacheStopRequests().size() > 0) { http://git-wip-us.apache.org/repos/asf/ignite/blob/f4ad01b7/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/f4ad01b7/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheDatabaseSharedManager.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/f4ad01b7/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheOffheapManager.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/f4ad01b7/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java ----------------------------------------------------------------------