You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by na...@apache.org on 2022/12/27 10:16:42 UTC
[ignite] branch master updated: IGNITE-18348 Replaced deprecated Ignite.active() by Ignite.cluster().state() (#10440)
This is an automated email from the ASF dual-hosted git repository.
namelchev pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new 098e0911793 IGNITE-18348 Replaced deprecated Ignite.active() by Ignite.cluster().state() (#10440)
098e0911793 is described below
commit 098e09117934295c9314315dedf0eca1648022f5
Author: Julia Bakulina <96...@users.noreply.github.com>
AuthorDate: Tue Dec 27 13:16:31 2022 +0300
IGNITE-18348 Replaced deprecated Ignite.active() by Ignite.cluster().state() (#10440)
---
docs/_docs/persistence/native-persistence.adoc | 2 +-
.../persistentstore/PersistentStoreExample.java | 3 +-
.../jol/FileStoreHeapUtilizationJolBenchmark.java | 5 +-
.../common/RunningQueryInfoCheckInitiatorTest.java | 3 +-
.../rest/ChangeStateCommandHandlerTest.java | 8 +-
.../rest/JettyRestProcessorAbstractSelfTest.java | 4 +-
...ttyRestProcessorAuthenticationAbstractTest.java | 3 +-
.../rest/JettyRestProcessorBaselineSelfTest.java | 3 +-
.../JdbcThinAuthenticateConnectionSelfTest.java | 3 +-
.../thin/JdbcThinMissingLongArrayResultsTest.java | 3 +-
...nsactionFinishOnDeactivatedClusterSelfTest.java | 5 +-
.../DiskPageCompressionConfigValidationTest.java | 3 +-
.../DiskPageCompressionIntegrationTest.java | 5 +-
.../WalPageCompressionIntegrationTest.java | 4 +-
.../apache/ignite/events/BaselineEventsTest.java | 17 +-
.../indexreader/IgniteIndexReaderTest.java | 5 +-
.../util/GridCommandHandlerBrokenIndexTest.java | 3 +-
...idCommandHandlerCheckIndexesInlineSizeTest.java | 3 +-
...idCommandHandlerClusterByClassAbstractTest.java | 3 +-
.../GridCommandHandlerIndexForceRebuildTest.java | 3 +-
.../util/GridCommandHandlerIndexListTest.java | 3 +-
.../GridCommandHandlerIndexRebuildStatusTest.java | 3 +-
.../util/GridCommandHandlerIndexingTest.java | 2 +-
.../GridCommandHandlerInterruptCommandTest.java | 7 +-
.../ignite/util/GridCommandHandlerSslTest.java | 6 +-
.../apache/ignite/util/GridCommandHandlerTest.java | 104 +++----
.../src/main/java/org/apache/ignite/Ignite.java | 5 +-
.../org/apache/ignite/configuration/WALMode.java | 5 +-
.../org/apache/ignite/internal/IgniteKernal.java | 4 +-
.../apache/ignite/internal/IgniteMXBeanImpl.java | 2 +-
.../org/apache/ignite/internal/IgnitionEx.java | 2 +-
.../ignite/internal/cluster/IgniteClusterImpl.java | 3 +-
.../managers/discovery/GridDiscoveryManager.java | 2 +-
.../managers/encryption/GridEncryptionManager.java | 4 +-
.../IgniteAuthenticationProcessor.java | 2 +-
.../cache/CacheAffinitySharedManager.java | 2 +-
.../processors/cache/ClusterCachesInfo.java | 4 +-
.../platform/cluster/PlatformClusterGroup.java | 5 +-
.../handlers/cache/GridCacheCommandHandler.java | 2 +-
.../cluster/GridBaselineCommandHandler.java | 2 +-
.../internal/visor/baseline/VisorBaselineTask.java | 2 +-
.../visor/baseline/VisorBaselineViewTask.java | 2 +-
.../apache/ignite/cache/CircledRebalanceTest.java | 3 +-
.../ClientCreateCacheGroupOnJoinNodeMapsTest.java | 5 +-
.../ignite/cache/NotOptimizedRebalanceTest.java | 3 +-
.../RebalanceAfterResettingLostPartitionTest.java | 3 +-
.../ignite/cache/RebalanceCancellationTest.java | 4 +-
.../cache/RebalanceCompleteDuringExchangeTest.java | 3 +-
.../ignite/cache/ResetLostPartitionTest.java | 7 +-
.../ignite/cache/store/StoreArrayKeyTest.java | 3 +-
...JdbcPojoWriteBehindStoreWithCoalescingTest.java | 7 +-
.../events/ClusterActivationStartedEventTest.java | 20 +-
.../failure/FailureHandlingConfigurationTest.java | 11 +-
.../ignite/failure/IoomFailureHandlerTest.java | 3 +-
.../ClusterBaselineNodesMetricsSelfTest.java | 3 +-
.../DiagnosticLogForPartitionStatesTest.java | 3 +-
.../internal/GridNodeMetricsLogPdsSelfTest.java | 3 +-
.../ignite/internal/ThreadNameValidationTest.java | 3 +-
.../internal/cluster/IgniteClusterIdTagTest.java | 7 +-
.../encryption/AbstractEncryptionTest.java | 3 +-
.../encryption/EncryptedCacheCreateTest.java | 3 +-
.../encryption/EncryptedCacheGroupCreateTest.java | 3 +-
.../encryption/EncryptedCacheNodeJoinTest.java | 14 +-
.../internal/encryption/EncryptionMXBeanTest.java | 11 +-
.../internal/encryption/MasterKeyChangeTest.java | 5 +-
.../GridIoManagerFileTransmissionSelfTest.java | 5 +-
.../internal/metric/IoStatisticsCacheSelfTest.java | 3 +-
.../ignite/internal/metric/JmxExporterSpiTest.java | 2 +-
.../internal/metric/MetricsConfigurationTest.java | 4 +-
.../ignite/internal/metric/SystemViewSelfTest.java | 2 +-
.../wal/record/WALRecordSerializationTest.java | 5 +-
.../processors/DeadLockOnNodeLeftExchangeTest.java | 3 +-
.../Authentication1kUsersNodeRestartTest.java | 3 +-
.../AuthenticationConfigurationClusterTest.java | 3 +-
.../AuthenticationOnNotActiveClusterTest.java | 3 +-
.../AuthenticationProcessorNodeRestartTest.java | 3 +-
.../AuthenticationProcessorSelfTest.java | 3 +-
...tadataRegistrationInsideEntryProcessorTest.java | 3 +-
.../cache/CacheDataRegionConfigurationTest.java | 11 +-
.../processors/cache/CacheGroupMetricsTest.java | 4 +-
.../processors/cache/CacheMetricsManageTest.java | 9 +-
.../cache/CacheValidatorMetricsTest.java | 3 +-
...heWithDifferentDataRegionConfigurationTest.java | 7 +-
.../processors/cache/ClusterStateTestUtils.java | 2 +-
...teDynamicCacheStartFailWithPersistenceTest.java | 3 +-
.../cache/IgniteMarshallerCacheFSRestoreTest.java | 3 +-
...NonAffinityCoordinatorDynamicStartStopTest.java | 3 +-
.../PartitionsExchangeCoordinatorFailoverTest.java | 5 +-
.../RebalanceWithDifferentThreadPoolSizeTest.java | 3 +-
.../cache/WalModeChangeAbstractSelfTest.java | 3 +-
.../binary/BinaryMetadataMoveLegacyFolderTest.java | 3 +-
.../BinaryMetadataRemoveWithPersistenceTest.java | 3 +-
.../IgniteSequenceInternalCleanupTest.java | 5 +-
.../OutOfMemoryVolatileRegionTest.java | 3 +-
.../cache/distributed/Cache64kPartitionsTest.java | 3 +-
.../distributed/CacheBaselineTopologyTest.java | 38 +--
.../distributed/CacheBlockOnReadAbstractTest.java | 5 +-
.../CacheDataLossOnPartitionMoveTest.java | 3 +-
.../distributed/CachePageWriteLockUnlockTest.java | 7 +-
.../cache/distributed/CacheParallelStartTest.java | 5 +-
.../CachePartitionLossWithPersistenceTest.java | 7 +-
.../CachePartitionLossWithRestartsTest.java | 3 +-
...CachePartitionLostAfterSupplierHasLeftTest.java | 9 +-
.../distributed/CacheRentingStateRepairTest.java | 5 +-
.../CacheResultIsNotNullOnPartitionLossTest.java | 3 +-
.../FailBackupOnAtomicOperationTest.java | 3 +-
.../GridCachePartitionNotLoadedEventSelfTest.java | 9 +-
.../distributed/GridExchangeFreeSwitchTest.java | 2 +-
.../IgniteCachePartitionLossPolicySelfTest.java | 3 +-
.../dht/CacheGetReadFromBackupFailoverTest.java | 3 +-
.../distributed/dht/GracefulShutdownTest.java | 9 +-
.../dht/GridCacheDhtPreloadDelayedSelfTest.java | 13 +-
.../dht/GridCacheDhtPreloadWaitForBackupsTest.java | 31 +-
.../GridCachePartitionsStateValidationTest.java | 5 +-
.../dht/IgniteCacheStartWithLoadTest.java | 3 +-
.../GridCacheRebalancingPartitionCountersTest.java | 7 +-
.../GridCacheRebalancingWithAsyncClearingTest.java | 5 +-
...eRebalanceOnCachesStoppingOrDestroyingTest.java | 7 +-
.../rebalancing/RebalanceStatisticsTest.java | 3 +-
.../PageEvictionMultinodeMixedRegionsTest.java | 3 +-
...heMvccAbstractBasicCoordinatorFailoverTest.java | 3 +-
.../mvcc/CacheMvccConfigurationValidationTest.java | 5 +-
...acheMvccPartitionedCoordinatorFailoverTest.java | 7 +-
.../mvcc/CacheMvccProcessorLazyStartTest.java | 5 +-
.../cache/mvcc/CacheMvccProcessorTest.java | 5 +-
.../cache/mvcc/CacheMvccTransactionsTest.java | 3 +-
.../cache/mvcc/CacheMvccTxFailoverTest.java | 7 +-
.../processors/cache/mvcc/CacheMvccVacuumTest.java | 21 +-
.../persistence/CleanupRestoredCachesSlowTest.java | 3 +-
.../CommonPoolStarvationCheckpointTest.java | 3 +-
...niteBaselineAffinityTopologyActivationTest.java | 87 +++---
.../IgniteDataStorageMetricsSelfTest.java | 3 +-
...gniteLostPartitionsOnLeaveBaselineSelfTest.java | 3 +-
.../IgnitePdsBinaryMetadataAsyncWritingTest.java | 16 +-
...gnitePdsBinaryMetadataOnClusterRestartTest.java | 33 ++-
.../IgnitePdsBinarySortObjectFieldsTest.java | 3 +-
...CacheConfigurationFileConsistencyCheckTest.java | 7 +-
.../IgnitePdsCacheEntriesExpirationTest.java | 3 +-
...sCacheObjectBinaryProcessorOnDiscoveryTest.java | 3 +-
.../IgnitePdsCacheRebalancingAbstractTest.java | 13 +-
...itePdsCacheStartStopWithFreqCheckpointTest.java | 3 +-
...nitePdsConsistencyOnDelayedPartitionOwning.java | 3 +-
.../IgnitePdsContinuousRestartTest.java | 3 +-
.../persistence/IgnitePdsCorruptedIndexTest.java | 5 +-
.../persistence/IgnitePdsCorruptedStoreTest.java | 27 +-
.../IgnitePdsDestroyCacheAbstractTest.java | 5 +-
.../persistence/IgnitePdsDestroyCacheTest.java | 10 +-
...gnitePdsDestroyCacheWithoutCheckpointsTest.java | 5 +-
...IgnitePdsDiscoDataHandlingInNewClusterTest.java | 3 +-
.../persistence/IgnitePdsDynamicCacheTest.java | 9 +-
.../IgnitePdsExchangeDuringCheckpointTest.java | 5 +-
...PdsMarshallerMappingRestoreOnNodeStartTest.java | 5 +-
.../IgnitePdsNoSpaceLeftOnDeviceTest.java | 3 +-
.../cache/persistence/IgnitePdsPageSizesTest.java | 3 +-
.../IgnitePdsPartitionFilesDestroyTest.java | 11 +-
.../IgnitePdsPartitionsStateRecoveryTest.java | 5 +-
.../IgnitePdsRemoveDuringRebalancingTest.java | 3 +-
...tePdsRestartAfterFailedToWriteMetaPageTest.java | 3 +-
.../IgnitePdsSporadicDataRecordsOnBackupTest.java | 5 +-
...IgnitePdsSpuriousRebalancingOnNodeJoinTest.java | 3 +-
.../persistence/IgnitePdsTaskCancelingTest.java | 3 +-
.../IgnitePersistentStoreCacheGroupsTest.java | 19 +-
.../IgnitePersistentStoreDataStructuresTest.java | 31 +-
...gniteRebalanceScheduleResendPartitionsTest.java | 3 +-
.../persistence/SingleNodePersistenceSslTest.java | 5 +-
.../persistence/WalPreloadingConcurrentTest.java | 3 +-
.../ClientAffinityAssignmentWithBaselineTest.java | 15 +-
.../IgniteAbsentEvictionNodeOutOfBaselineTest.java | 3 +-
...gniteAllBaselineNodesOnlineFullApiSelfTest.java | 4 +-
...hangingBaselineDownCachePutAllFailoverTest.java | 3 +-
...hangingBaselineDownCacheRemoveFailoverTest.java | 3 +-
...eChangingBaselineUpCachePutAllFailoverTest.java | 3 +-
...eChangingBaselineUpCacheRemoveFailoverTest.java | 3 +-
.../IgniteOfflineBaselineNodeFullApiSelfTest.java | 4 +-
...niteOnlineNodeOutOfBaselineFullApiSelfTest.java | 4 +-
...gniteStableBaselineCachePutAllFailoverTest.java | 3 +-
...gniteStableBaselineCacheRemoveFailoverTest.java | 3 +-
.../db/CheckpointBufferDeadlockTest.java | 3 +-
.../db/FullHistRebalanceOnClientStopTest.java | 3 +-
.../persistence/db/IgniteLogicalRecoveryTest.java | 15 +-
.../persistence/db/IgnitePdsCacheRestoreTest.java | 3 +-
...IgnitePdsCacheWalDisabledOnRebalancingTest.java | 3 +-
.../db/IgnitePdsDataRegionMetricsTest.java | 9 +-
.../db/IgnitePdsMultiNodePutGetRestartTest.java | 4 +-
.../persistence/db/IgnitePdsPageEvictionTest.java | 3 +-
...PdsPageReplacementDuringPartitionClearTest.java | 3 +-
...gnitePdsRebalancingOnNotStableTopologyTest.java | 7 +-
.../db/IgnitePdsStartWIthEmptyArchive.java | 5 +-
.../db/IgnitePdsTransactionsHangTest.java | 3 +-
.../db/IgnitePdsWholeClusterRestartTest.java | 5 +-
.../cache/persistence/db/IgnitePdsWithTtlTest.java | 3 +-
.../db/IgniteSequentialNodeCrashRecoveryTest.java | 3 +-
.../SlowHistoricalRebalanceSmallHistoryTest.java | 3 +-
.../CheckpointFailBeforeWriteMarkTest.java | 5 +-
.../db/checkpoint/CheckpointFreeListTest.java | 11 +-
.../CheckpointListenerForRegionTest.java | 3 +-
.../db/checkpoint/CheckpointStartLoggingTest.java | 3 +-
.../IgniteCheckpointDirtyPagesForLowLoadTest.java | 3 +-
.../db/checkpoint/IgniteMassLoadSandboxTest.java | 13 +-
.../db/checkpoint/LightweightCheckpointTest.java | 5 +-
.../DefaultPageSizeBackwardsCompatibilityTest.java | 5 +-
.../IgnitePdsCacheDestroyDuringCheckpointTest.java | 3 +-
.../db/file/IgnitePdsCacheIntegrationTest.java | 7 +-
...CheckpointSimulationWithRealCpDisabledTest.java | 19 +-
.../db/file/IgnitePdsDiskErrorsRecoveringTest.java | 17 +-
.../db/file/IgnitePdsNoActualWalHistoryTest.java | 5 +-
.../db/file/IgnitePdsPageReplacementTest.java | 3 +-
.../IgniteUidAsConsistentIdMigrationTest.java | 25 +-
.../db/wal/FsyncWalRolloverDoesNotBlockTest.java | 3 +-
.../db/wal/HistoricalReservationTest.java | 13 +-
.../wal/IgniteNodeStoppedDuringDisableWALTest.java | 3 +-
...ailIsReachedDuringIterationOverArchiveTest.java | 3 +-
.../db/wal/IgniteWalFlushFailoverTest.java | 3 +-
...eWalFlushMultiNodeFailoverAbstractSelfTest.java | 5 +-
.../db/wal/IgniteWalFormatFileFailoverTest.java | 3 +-
.../db/wal/IgniteWalHistoryReservationsTest.java | 15 +-
.../db/wal/IgniteWalRebalanceLoggingTest.java | 3 +-
.../persistence/db/wal/IgniteWalRebalanceTest.java | 3 +-
.../db/wal/IgniteWalRecoveryPPCTest.java | 9 +-
.../wal/IgniteWalRecoverySeveralRestartsTest.java | 13 +-
.../db/wal/IgniteWalReplayingAfterRestartTest.java | 7 +-
.../db/wal/IgniteWalSerializerVersionTest.java | 3 +-
.../db/wal/WalCompactionNoArchiverTest.java | 3 +-
.../db/wal/WalCompactionSwitchOnTest.java | 5 +-
.../persistence/db/wal/WalCompactionTest.java | 13 +-
.../db/wal/WalRebalanceRestartTest.java | 3 +-
.../db/wal/WalRecoveryTxLogicalRecordsTest.java | 31 +-
.../db/wal/WalRolloverRecordLoggingTest.java | 3 +-
.../persistence/db/wal/WalRolloverTypesTest.java | 9 +-
.../IgniteAbstractWalIteratorInvalidCrcTest.java | 5 +-
...teWithoutArchiverWalIteratorInvalidCrcTest.java | 5 +-
.../db/wal/reader/IgniteWalReaderTest.java | 30 +-
.../persistence/freelist/FreeListCachingTest.java | 5 +-
.../metastorage/IgniteMetaStorageBasicTest.java | 23 +-
.../pagemem/PageMemoryLazyAllocationTest.java | 3 +-
.../PageMemoryLazyAllocationWithPDSTest.java | 9 +-
.../pagemem/PagesWriteThrottleSandboxTest.java | 3 +-
.../pagemem/PagesWriteThrottleSmokeTest.java | 3 +-
.../pagemem/UsedPagesMetricAbstractTest.java | 3 +-
.../standbycluster/AbstractNodeJoinTemplate.java | 9 +-
.../IgniteChangeGlobalStateAbstractTest.java | 3 +-
.../IgniteChangeGlobalStateCacheTest.java | 27 +-
.../IgniteChangeGlobalStateDataStreamerTest.java | 41 +--
.../IgniteChangeGlobalStateDataStructureTest.java | 67 ++---
.../IgniteChangeGlobalStateFailOverTest.java | 43 +--
.../IgniteChangeGlobalStateServiceTest.java | 3 +-
.../IgniteChangeGlobalStateTest.java | 329 +++++++++++----------
.../IgniteNoParrallelClusterIsAllowedTest.java | 7 +-
.../standbycluster/IgniteStandByClusterTest.java | 81 ++---
.../extended/GridActivateExtensionTest.java | 5 +-
.../IgniteStandByClientReconnectTest.java | 95 +++---
...niteStandByClientReconnectToNewClusterTest.java | 97 +++---
.../wal/CpTriggeredWalDeltaConsistencyTest.java | 3 +-
.../wal/ExplicitWalDeltaConsistencyTest.java | 15 +-
.../wal/SysPropWalDeltaConsistencyTest.java | 3 +-
.../wal/WalEnableDisableWithNodeShutdownTest.java | 7 +-
.../wal/WalEnableDisableWithRestartsTest.java | 3 +-
.../reader/StandaloneWalRecordsIteratorTest.java | 3 +-
.../cache/query/CacheDataPageScanQueryTest.java | 5 +-
.../AbstractTransactionIntergrityTest.java | 3 +-
.../transactions/PartitionUpdateCounterTest.java | 3 +-
.../TxCrossCachePartitionConsistencyTest.java | 3 +-
.../cache/transactions/TxOnCachesStartTest.java | 3 +-
.../cache/transactions/TxOnCachesStopTest.java | 9 +-
.../TxPartitionCounterStateAbstractTest.java | 3 +-
.../TxPartitionCounterStateConsistencyTest.java | 20 +-
...ounterStateOnePrimaryTwoBackupsFailAllTest.java | 3 +-
.../cache/transactions/TxRollbackAsyncTest.java | 3 +-
.../transactions/TxWithKeyContentionSelfTest.java | 3 +-
.../TxWithSmallTimeoutAndContentionOneKeyTest.java | 3 +-
.../cluster/BaselineAutoAdjustInMemoryTest.java | 3 +-
.../DistributedConfigurationAbstractTest.java | 3 +-
.../DistributedConfigurationPersistentTest.java | 9 +-
.../processors/database/IgniteDbAbstractTest.java | 3 +-
.../database/IgniteDbDynamicCacheSelfTest.java | 5 +-
.../database/IgniteDbPutGetWithCacheStoreTest.java | 9 +-
.../datastreamer/DataStreamProcessorSelfTest.java | 5 +-
.../DistributedMetaStoragePersistentTest.java | 38 +--
.../metastorage/DistributedMetaStorageTest.java | 31 +-
.../processors/rest/RestProtocolStartTest.java | 4 +-
.../AbstractCacheOperationPermissionCheckTest.java | 3 +-
.../client/AdditionalSecurityCheckTest.java | 2 +-
.../client/ThinClientSslPermissionCheckTest.java | 3 +-
.../compute/ComputePermissionCheckTest.java | 3 +-
.../security/sandbox/AbstractSandboxTest.java | 3 +-
.../AccessToClassesInsideInternalPackageTest.java | 3 +-
.../sandbox/SecuritySubjectPermissionsTest.java | 3 +-
.../service/ServiceDeploymentOnActivationTest.java | 7 +-
.../ServiceDeploymentOutsideBaselineTest.java | 7 +-
.../GridMarshallerMappingConsistencyTest.java | 9 +-
.../ignite/p2p/P2PScanQueryUndeployTest.java | 3 +-
.../junits/common/GridCommonAbstractTest.java | 5 +-
.../GridInternalTaskUnusedWalSegmentsTest.java | 3 +-
.../ignite/util/mbeans/GridMBeanBaselineTest.java | 3 +-
.../modulestest/IgniteLaunchInModularEnvTest.java | 2 +-
.../utils/IgniteWalConverterSensitiveDataTest.java | 3 +-
.../development/utils/IgniteWalConverterTest.java | 3 +-
.../file/IgniteNativeIoWithNoPersistenceTest.java | 3 +-
.../processors/query/h2/IgniteH2Indexing.java | 3 +-
.../org/apache/ignite/client/SecurityTest.java | 3 +-
...aryMetadataConcurrentUpdateWithIndexesTest.java | 3 +-
.../CacheGroupMetricsWithIndexBuildFailTest.java | 5 +-
.../cache/CacheGroupMetricsWithIndexTest.java | 13 +-
...eckIndexesInlineSizeOnNodeJoinMultiJvmTest.java | 3 +-
.../IgniteCacheObjectKeyIndexingSelfTest.java | 3 +-
.../cache/IgniteDynamicSqlRestoreTest.java | 35 +--
.../cache/IgniteErrorOnRebalanceTest.java | 3 +-
.../QueryJoinWithDifferentNodeFiltersTest.java | 3 +-
.../cache/StartCachesInParallelTest.java | 5 +-
.../authentication/SqlUserCommandSelfTest.java | 3 +-
.../near/IgniteSqlQueryWithBaselineTest.java | 7 +-
.../processors/cache/index/ArrayIndexTest.java | 9 +-
.../processors/cache/index/BasicIndexTest.java | 12 +-
.../ClientReconnectWithSqlTableConfiguredTest.java | 3 +-
.../cache/index/H2RowCachePageEvictionTest.java | 5 +-
.../index/H2TreeCorruptedTreeExceptionTest.java | 3 +-
.../processors/cache/index/IndexMetricsTest.java | 5 +-
.../index/IoStatisticsBasicIndexSelfTest.java | 7 +-
.../processors/cache/index/LongIndexNameTest.java | 5 +-
.../index/OptimizedMarshallerIndexNameTest.java | 3 +-
.../processors/cache/index/StaticCacheDdlTest.java | 7 +-
.../index/StopNodeOnRebuildIndexFailureTest.java | 3 +-
.../cache/metric/SqlViewExporterSpiTest.java | 7 +-
.../mvcc/CacheMvccSqlTxQueriesAbstractTest.java | 3 +-
.../persistence/RebuildIndexLogMessageTest.java | 5 +-
.../db/IgniteCacheGroupsWithRestartsTest.java | 3 +-
.../persistence/db/IgniteTcBotInitNewPageTest.java | 3 +-
...xingMultithreadedLoadContinuousRestartTest.java | 3 +-
.../db/LongDestroyDurableBackgroundTaskTest.java | 9 +-
.../persistence/db/wal/IgniteWalRecoveryTest.java | 64 ++--
...niteDbSingleNodeWithIndexingWalRestoreTest.java | 9 +-
...tStoreQueryWithMultipleClassesPerCacheTest.java | 3 +-
.../IgnitePersistentStoreSchemaLoadTest.java | 9 +-
.../database/IgniteTwoRegionsRebuildIndexTest.java | 3 +-
.../processors/database/RebuildIndexTest.java | 3 +-
.../RebuildIndexWithHistoricalRebalanceTest.java | 3 +-
...eLockPartitionOnAffinityRunAtomicCacheTest.java | 3 +-
...elineLockPartitionOnAffinityRunTxCacheTest.java | 3 +-
...ngingBaselineCacheQueryNodeRestartSelfTest.java | 3 +-
...iteStableBaselineBinObjFieldsQuerySelfTest.java | 3 +-
...ableBaselineCacheQueryNodeRestartsSelfTest.java | 3 +-
.../query/IgniteSqlCustomSchemaWithPdsEnabled.java | 5 +-
.../processors/query/LocalQueryLazyTest.java | 5 +-
.../processors/query/SqlSystemViewsSelfTest.java | 10 +-
.../SqlTwoCachesInGroupWithSameEntryTest.java | 3 +-
.../query/h2/GridIndexRebuildSelfTest.java | 3 +-
.../processors/query/h2/GridIndexRebuildTest.java | 5 +-
.../processors/query/h2/QueryDataPageScanTest.java | 7 +-
.../processors/query/oom/AbstractQueryOOMTest.java | 7 +-
.../java/org/apache/ignite/IgniteSpringBean.java | 5 +-
.../SpringEncryptedCacheRestartClientTest.java | 3 +-
.../SpringEncryptedCacheRestartTest.java | 7 +-
.../ignite/yardstick/IgniteAbstractBenchmark.java | 5 +-
.../yardstick/jdbc/AbstractJdbcBenchmark.java | 3 +-
...coverySegmentationAndConnectionRestoreTest.java | 3 +-
355 files changed, 1683 insertions(+), 1366 deletions(-)
diff --git a/docs/_docs/persistence/native-persistence.adoc b/docs/_docs/persistence/native-persistence.adoc
index f0ddbb70c7a..4d67c2cb4f4 100644
--- a/docs/_docs/persistence/native-persistence.adoc
+++ b/docs/_docs/persistence/native-persistence.adoc
@@ -197,7 +197,7 @@ If the memory-mapped file approach is disabled then the changes stay in node's i
Otherwise, recent data updates may get lost in case of a process crash or other outages.
| `NONE` | WAL is disabled. The changes are persisted only if you shut down the node gracefully.
-Use `Ignite.active(false)` to deactivate the cluster and shut down the node.
+Use `Ignite.cluster().state(ClusterState.INACTIVE)` to deactivate the cluster and shut down the node.
| Data loss might occur.
diff --git a/examples/src/main/java/org/apache/ignite/examples/persistentstore/PersistentStoreExample.java b/examples/src/main/java/org/apache/ignite/examples/persistentstore/PersistentStoreExample.java
index e9731b9c5fc..18cf85f0687 100644
--- a/examples/src/main/java/org/apache/ignite/examples/persistentstore/PersistentStoreExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/persistentstore/PersistentStoreExample.java
@@ -26,6 +26,7 @@ import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.CacheWriteSynchronizationMode;
import org.apache.ignite.cache.query.QueryCursor;
import org.apache.ignite.cache.query.SqlFieldsQuery;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.examples.datagrid.CacheQueryExample;
import org.apache.ignite.examples.model.Organization;
@@ -63,7 +64,7 @@ public class PersistentStoreExample {
try (Ignite ignite = Ignition.start("examples/config/persistentstore/example-persistent-store.xml")) {
// Activate the cluster. Required to do if the persistent store is enabled because you might need
// to wait while all the nodes, that store a subset of data on disk, join the cluster.
- ignite.active(true);
+ ignite.cluster().state(ClusterState.ACTIVE);
CacheConfiguration<Long, Organization> cacheCfg = new CacheConfiguration<>(ORG_CACHE);
diff --git a/modules/benchmarks/src/main/java/org/apache/ignite/internal/benchmarks/jol/FileStoreHeapUtilizationJolBenchmark.java b/modules/benchmarks/src/main/java/org/apache/ignite/internal/benchmarks/jol/FileStoreHeapUtilizationJolBenchmark.java
index ffc7b5037a8..35d7d587dcf 100644
--- a/modules/benchmarks/src/main/java/org/apache/ignite/internal/benchmarks/jol/FileStoreHeapUtilizationJolBenchmark.java
+++ b/modules/benchmarks/src/main/java/org/apache/ignite/internal/benchmarks/jol/FileStoreHeapUtilizationJolBenchmark.java
@@ -25,6 +25,7 @@ import org.apache.ignite.IgniteCache;
import org.apache.ignite.IgniteException;
import org.apache.ignite.Ignition;
import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.DataRegionConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
@@ -114,7 +115,7 @@ public class FileStoreHeapUtilizationJolBenchmark {
Ignite ignite = Ignition.start(getConfiguration(name));
- ignite.cluster().active(true);
+ ignite.cluster().state(ClusterState.ACTIVE);
long start = System.currentTimeMillis();
@@ -133,7 +134,7 @@ public class FileStoreHeapUtilizationJolBenchmark {
GraphLayout layout = GraphLayout.parseInstance(ignite);
- ignite.cluster().active(false);
+ ignite.cluster().state(ClusterState.INACTIVE);
Ignition.stop(name, true);
diff --git a/modules/clients/src/test/java/org/apache/ignite/common/RunningQueryInfoCheckInitiatorTest.java b/modules/clients/src/test/java/org/apache/ignite/common/RunningQueryInfoCheckInitiatorTest.java
index 88dd1b7c2c1..b8c5bc56854 100644
--- a/modules/clients/src/test/java/org/apache/ignite/common/RunningQueryInfoCheckInitiatorTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/common/RunningQueryInfoCheckInitiatorTest.java
@@ -34,6 +34,7 @@ import org.apache.ignite.cache.query.FieldsQueryCursor;
import org.apache.ignite.cache.query.SqlFieldsQuery;
import org.apache.ignite.cache.query.annotations.QuerySqlFunction;
import org.apache.ignite.client.IgniteClient;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.ClientConfiguration;
import org.apache.ignite.configuration.DataRegionConfiguration;
@@ -78,7 +79,7 @@ public class RunningQueryInfoCheckInitiatorTest extends JdbcThinAbstractSelfTest
startGrid(0);
startClientGrid(1);
- grid(0).cluster().active(true);
+ grid(0).cluster().state(ClusterState.ACTIVE);
}
/** {@inheritDoc} */
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/ChangeStateCommandHandlerTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/ChangeStateCommandHandlerTest.java
index 93670d7376e..2fb7e742486 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/ChangeStateCommandHandlerTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/ChangeStateCommandHandlerTest.java
@@ -96,14 +96,14 @@ public class ChangeStateCommandHandlerTest extends GridCommonAbstractTest {
IgniteEx ig1 = grid(0);
IgniteEx ig2 = grid(1);
- assertFalse(ig1.active());
- assertFalse(ig2.active());
+ assertFalse(ig1.cluster().state().active());
+ assertFalse(ig2.cluster().state().active());
assertEquals(INACTIVE, state.state());
state.state(ACTIVE, false);
- assertTrue(ig1.active());
- assertTrue(ig2.active());
+ assertTrue(ig1.cluster().state().active());
+ assertTrue(ig2.cluster().state().active());
assertEquals(ACTIVE, state.state());
}
}
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java
index 76f6588e81e..5bc4060f75b 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java
@@ -2052,7 +2052,7 @@ public abstract class JettyRestProcessorAbstractSelfTest extends JettyRestProces
startGrids(gridCount());
- grid(0).cluster().active(true);
+ grid(0).cluster().state(ClusterState.ACTIVE);
initCache();
}
@@ -3575,7 +3575,7 @@ public abstract class JettyRestProcessorAbstractSelfTest extends JettyRestProces
JsonNode res = validateJsonResponse(ret);
assertEquals(ret, exp, res.asBoolean());
- assertEquals(ret, exp, grid(0).cluster().active());
+ assertEquals(ret, exp, grid(0).cluster().state().active());
}
/**
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAuthenticationAbstractTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAuthenticationAbstractTest.java
index 6ecc2e158d7..37ae4a6bef1 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAuthenticationAbstractTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAuthenticationAbstractTest.java
@@ -19,6 +19,7 @@ package org.apache.ignite.internal.processors.rest;
import java.util.concurrent.Callable;
import com.fasterxml.jackson.databind.JsonNode;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.DataRegionConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
@@ -55,7 +56,7 @@ public abstract class JettyRestProcessorAuthenticationAbstractTest extends Jetty
/** {@inheritDoc} */
@Override protected void initCache() {
// We need to activate cluster.
- grid(0).cluster().active(true);
+ grid(0).cluster().state(ClusterState.ACTIVE);
super.initCache();
}
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorBaselineSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorBaselineSelfTest.java
index 1700f22d68b..f938d663929 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorBaselineSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorBaselineSelfTest.java
@@ -23,6 +23,7 @@ import java.util.Collection;
import java.util.Collections;
import com.fasterxml.jackson.databind.JsonNode;
import org.apache.ignite.cluster.BaselineNode;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.DataRegionConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
@@ -48,7 +49,7 @@ public class JettyRestProcessorBaselineSelfTest extends JettyRestProcessorCommon
grid(0).cluster().baselineAutoAdjustEnabled(false);
// We need to activate cluster.
- grid(0).cluster().active(true);
+ grid(0).cluster().state(ClusterState.ACTIVE);
}
/** {@inheritDoc} */
diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinAuthenticateConnectionSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinAuthenticateConnectionSelfTest.java
index 63cef5c1920..23933d9117e 100644
--- a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinAuthenticateConnectionSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinAuthenticateConnectionSelfTest.java
@@ -21,6 +21,7 @@ import java.sql.Connection;
import java.sql.DriverManager;
import java.sql.SQLException;
import java.util.concurrent.Callable;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.DataRegionConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
@@ -67,7 +68,7 @@ public class JdbcThinAuthenticateConnectionSelfTest extends JdbcThinAbstractSelf
startGrids(2);
- grid(0).cluster().active(true);
+ grid(0).cluster().state(ClusterState.ACTIVE);
try (AutoCloseable ignored = withSecurityContextOnAllNodes(authenticate(grid(0), "ignite", "ignite"))) {
grid(0).context().security().createUser("another_user", "passwd".toCharArray());
diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinMissingLongArrayResultsTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinMissingLongArrayResultsTest.java
index 8111867e96a..be619631382 100644
--- a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinMissingLongArrayResultsTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinMissingLongArrayResultsTest.java
@@ -29,6 +29,7 @@ import java.util.concurrent.TimeUnit;
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteDataStreamer;
import org.apache.ignite.cache.query.annotations.QuerySqlField;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
import org.jetbrains.annotations.NotNull;
@@ -147,7 +148,7 @@ public class JdbcThinMissingLongArrayResultsTest extends JdbcThinAbstractSelfTes
}
streamer.flush();
}
- ignite.active(true);
+ ignite.cluster().state(ClusterState.ACTIVE);
}
/**
diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/MvccJdbcTransactionFinishOnDeactivatedClusterSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/MvccJdbcTransactionFinishOnDeactivatedClusterSelfTest.java
index c72b97cb702..98609a94785 100644
--- a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/MvccJdbcTransactionFinishOnDeactivatedClusterSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/MvccJdbcTransactionFinishOnDeactivatedClusterSelfTest.java
@@ -22,6 +22,7 @@ import java.sql.DriverManager;
import java.sql.Statement;
import java.util.Collections;
import java.util.concurrent.CountDownLatch;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.ConnectorConfiguration;
import org.apache.ignite.configuration.DataRegionConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
@@ -80,7 +81,7 @@ public class MvccJdbcTransactionFinishOnDeactivatedClusterSelfTest extends GridC
public void checkTxFinishAfterDeactivation(boolean commit) throws Exception {
IgniteEx node0 = startGrid(0);
- node0.cluster().active(true);
+ node0.cluster().state(ClusterState.ACTIVE);
try (Connection conn = connect()) {
execute(conn, "CREATE TABLE t1(a INT, b VARCHAR, PRIMARY KEY(a)) WITH \"atomicity=TRANSACTIONAL_SNAPSHOT,backups=1\"");
@@ -88,7 +89,7 @@ public class MvccJdbcTransactionFinishOnDeactivatedClusterSelfTest extends GridC
final CountDownLatch enlistedLatch = new CountDownLatch(1);
- assert node0.cluster().active();
+ assert node0.cluster().state().active();
IgniteInternalFuture txFinishedFut = GridTestUtils.runAsync(() -> {
executeTransaction(commit, enlistedLatch, () -> !node0.context().state().publicApiActiveState(true));
diff --git a/modules/compress/src/test/java/org/apache/ignite/internal/processors/compress/DiskPageCompressionConfigValidationTest.java b/modules/compress/src/test/java/org/apache/ignite/internal/processors/compress/DiskPageCompressionConfigValidationTest.java
index 0e4a3486e2d..bad12e575e2 100644
--- a/modules/compress/src/test/java/org/apache/ignite/internal/processors/compress/DiskPageCompressionConfigValidationTest.java
+++ b/modules/compress/src/test/java/org/apache/ignite/internal/processors/compress/DiskPageCompressionConfigValidationTest.java
@@ -18,6 +18,7 @@ package org.apache.ignite.internal.processors.compress;
import java.util.List;
import org.apache.ignite.Ignite;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.DataRegionConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
@@ -87,7 +88,7 @@ public class DiskPageCompressionConfigValidationTest extends GridCommonAbstractT
public void testIncorrectDynamicCacheStartRequest() throws Exception {
Ignite ig = startGrid();
- ig.cluster().active(true);
+ ig.cluster().state(ClusterState.ACTIVE);
boolean expEThrown = false;
diff --git a/modules/compress/src/test/java/org/apache/ignite/internal/processors/compress/DiskPageCompressionIntegrationTest.java b/modules/compress/src/test/java/org/apache/ignite/internal/processors/compress/DiskPageCompressionIntegrationTest.java
index 00a2ae2cd93..ef04ed502c3 100644
--- a/modules/compress/src/test/java/org/apache/ignite/internal/processors/compress/DiskPageCompressionIntegrationTest.java
+++ b/modules/compress/src/test/java/org/apache/ignite/internal/processors/compress/DiskPageCompressionIntegrationTest.java
@@ -27,6 +27,7 @@ import java.util.concurrent.ConcurrentMap;
import org.apache.ignite.IgniteCache;
import org.apache.ignite.IgniteException;
import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.DataRegionConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
@@ -90,7 +91,7 @@ public class DiskPageCompressionIntegrationTest extends AbstractPageCompressionI
@Override protected void doTestPageCompression() throws Exception {
IgniteEx ignite = startGrid(0);
- ignite.cluster().active(true);
+ ignite.cluster().state(ClusterState.ACTIVE);
String cacheName = "test";
@@ -187,7 +188,7 @@ public class DiskPageCompressionIntegrationTest extends AbstractPageCompressionI
public void _testCompressionRatio() throws Exception {
IgniteEx ignite = startGrid(0);
- ignite.cluster().active(true);
+ ignite.cluster().state(ClusterState.ACTIVE);
String cacheName = "test";
diff --git a/modules/compress/src/test/java/org/apache/ignite/internal/processors/compress/WalPageCompressionIntegrationTest.java b/modules/compress/src/test/java/org/apache/ignite/internal/processors/compress/WalPageCompressionIntegrationTest.java
index eccb0211dfd..33700e4e1dc 100644
--- a/modules/compress/src/test/java/org/apache/ignite/internal/processors/compress/WalPageCompressionIntegrationTest.java
+++ b/modules/compress/src/test/java/org/apache/ignite/internal/processors/compress/WalPageCompressionIntegrationTest.java
@@ -63,8 +63,8 @@ public class WalPageCompressionIntegrationTest extends AbstractPageCompressionIn
// Reference ignite instance with uncompressed WAL page records.
IgniteEx ignite1 = startGrid(1);
- ignite0.cluster().active(true);
- ignite1.cluster().active(true);
+ ignite0.cluster().state(ClusterState.ACTIVE);
+ ignite1.cluster().state(ClusterState.ACTIVE);
String cacheName = "test";
diff --git a/modules/control-utility/src/test/java/org/apache/ignite/events/BaselineEventsTest.java b/modules/control-utility/src/test/java/org/apache/ignite/events/BaselineEventsTest.java
index f073c4aa891..135ac1b5648 100644
--- a/modules/control-utility/src/test/java/org/apache/ignite/events/BaselineEventsTest.java
+++ b/modules/control-utility/src/test/java/org/apache/ignite/events/BaselineEventsTest.java
@@ -21,6 +21,7 @@ import java.util.Arrays;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicLong;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.ConnectorConfiguration;
import org.apache.ignite.configuration.DataRegionConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
@@ -77,7 +78,7 @@ public abstract class BaselineEventsTest extends GridCommonAbstractTest {
/** */
@Test
public void testChangeBltWithControlUtility() throws Exception {
- startGrid(0).cluster().active(true);
+ startGrid(0).cluster().state(ClusterState.ACTIVE);
AtomicBoolean baselineChanged = new AtomicBoolean();
@@ -110,7 +111,7 @@ public abstract class BaselineEventsTest extends GridCommonAbstractTest {
/** */
@Test
public void testChangeBltWithPublicApi() throws Exception {
- startGrid(0).cluster().active(true);
+ startGrid(0).cluster().state(ClusterState.ACTIVE);
AtomicBoolean baselineChanged = new AtomicBoolean();
@@ -150,13 +151,13 @@ public abstract class BaselineEventsTest extends GridCommonAbstractTest {
EventType.EVT_BASELINE_CHANGED
);
- ignite.cluster().active(true);
+ ignite.cluster().state(ClusterState.ACTIVE);
assertTrue(GridTestUtils.waitForCondition(baselineChanged::get, 3_000));
baselineChanged.set(false);
- ignite.cluster().active(false);
- ignite.cluster().active(true);
+ ignite.cluster().state(ClusterState.INACTIVE);
+ ignite.cluster().state(ClusterState.ACTIVE);
assertFalse(GridTestUtils.waitForCondition(baselineChanged::get, 3_000));
}
@@ -166,7 +167,7 @@ public abstract class BaselineEventsTest extends GridCommonAbstractTest {
public void testChangeAutoAdjustEnabled() throws Exception {
IgniteClusterEx cluster = startGrids(2).cluster();
- cluster.active(true);
+ cluster.state(ClusterState.ACTIVE);
assertFalse(cluster.isBaselineAutoAdjustEnabled());
@@ -208,7 +209,7 @@ public abstract class BaselineEventsTest extends GridCommonAbstractTest {
public void testChangeAutoAdjustTimeout() throws Exception {
IgniteClusterEx cluster = startGrids(2).cluster();
- cluster.active(true);
+ cluster.state(ClusterState.ACTIVE);
AtomicLong autoAdjustTimeout = new AtomicLong();
@@ -241,7 +242,7 @@ public abstract class BaselineEventsTest extends GridCommonAbstractTest {
includedEvtTypes = new int[0];
IgniteClusterEx cluster = startGrid(0).cluster();
- cluster.active(true);
+ cluster.state(ClusterState.ACTIVE);
AtomicInteger evtsTriggered = new AtomicInteger();
diff --git a/modules/control-utility/src/test/java/org/apache/ignite/internal/commandline/indexreader/IgniteIndexReaderTest.java b/modules/control-utility/src/test/java/org/apache/ignite/internal/commandline/indexreader/IgniteIndexReaderTest.java
index 4154a185d42..4816e4f5b36 100644
--- a/modules/control-utility/src/test/java/org/apache/ignite/internal/commandline/indexreader/IgniteIndexReaderTest.java
+++ b/modules/control-utility/src/test/java/org/apache/ignite/internal/commandline/indexreader/IgniteIndexReaderTest.java
@@ -42,6 +42,7 @@ import org.apache.ignite.cache.QueryEntity;
import org.apache.ignite.cache.QueryIndex;
import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction;
import org.apache.ignite.cache.query.SqlFieldsQuery;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.DataRegionConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
@@ -237,8 +238,8 @@ public class IgniteIndexReaderTest extends GridCommandHandlerAbstractTest {
IgniteClusterEx cluster = node.cluster();
- if (!cluster.active())
- cluster.active(true);
+ if (!cluster.state().active())
+ cluster.state(ClusterState.ACTIVE);
IgniteCache<Integer, Object> qryCache = node.cache(QUERY_CACHE_NAME);
diff --git a/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerBrokenIndexTest.java b/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerBrokenIndexTest.java
index e4a7c441bcc..046227e80d2 100644
--- a/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerBrokenIndexTest.java
+++ b/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerBrokenIndexTest.java
@@ -21,6 +21,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.regex.Pattern;
import org.apache.ignite.Ignite;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.internal.IgniteEx;
import org.apache.ignite.internal.cache.query.index.Index;
@@ -124,7 +125,7 @@ public class GridCommandHandlerBrokenIndexTest extends GridCommandHandlerCluster
private void prepareGridForTest() throws Exception {
Ignite ignite = startGrids(2);
- ignite.cluster().active(true);
+ ignite.cluster().state(ClusterState.ACTIVE);
Ignite client = startGrid(CLIENT_NODE_NAME_PREFIX);
diff --git a/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerCheckIndexesInlineSizeTest.java b/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerCheckIndexesInlineSizeTest.java
index 7f24847432e..f0e6f995392 100644
--- a/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerCheckIndexesInlineSizeTest.java
+++ b/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerCheckIndexesInlineSizeTest.java
@@ -22,6 +22,7 @@ import java.util.Map;
import java.util.UUID;
import org.apache.ignite.IgniteLogger;
import org.apache.ignite.cache.query.SqlFieldsQuery;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.internal.IgniteEx;
import org.apache.ignite.testframework.junits.WithSystemProperty;
@@ -74,7 +75,7 @@ public class GridCommandHandlerCheckIndexesInlineSizeTest extends GridCommandHan
assertEquals(INITIAL_PAYLOAD_SIZE, Integer.parseInt(System.getProperty(IGNITE_MAX_INDEX_PAYLOAD_SIZE)));
- startGrids(NODES_CNT).cluster().active(true);
+ startGrids(NODES_CNT).cluster().state(ClusterState.ACTIVE);
for (Map.Entry<String, Object[]> entry : getSqlStatements().entrySet())
executeSql(grid(0), entry.getKey(), entry.getValue());
diff --git a/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerClusterByClassAbstractTest.java b/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerClusterByClassAbstractTest.java
index c624038aec8..b11e9a5e04e 100644
--- a/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerClusterByClassAbstractTest.java
+++ b/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerClusterByClassAbstractTest.java
@@ -20,6 +20,7 @@ package org.apache.ignite.util;
import java.util.HashSet;
import java.util.Set;
import org.apache.ignite.IgniteCache;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.internal.IgniteEx;
@@ -51,7 +52,7 @@ public abstract class GridCommandHandlerClusterByClassAbstractTest extends GridC
client = startGrid(CLIENT_NODE_NAME_PREFIX);
- crd.cluster().active(true);
+ crd.cluster().state(ClusterState.ACTIVE);
}
/** {@inheritDoc} */
diff --git a/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerIndexForceRebuildTest.java b/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerIndexForceRebuildTest.java
index aba2cba59f6..6015ac8312d 100644
--- a/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerIndexForceRebuildTest.java
+++ b/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerIndexForceRebuildTest.java
@@ -26,6 +26,7 @@ import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ThreadLocalRandom;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.stream.Collectors;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.internal.IgniteEx;
import org.apache.ignite.internal.IgniteInternalFuture;
@@ -150,7 +151,7 @@ public class GridCommandHandlerIndexForceRebuildTest extends GridCommandHandlerA
IgniteEx ignite = grid(0);
- ignite.cluster().active(true);
+ ignite.cluster().state(ClusterState.ACTIVE);
createAndFillCache(ignite, CACHE_NAME_1_1, GRP_NAME_1);
createAndFillCache(ignite, CACHE_NAME_1_2, GRP_NAME_1);
diff --git a/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerIndexListTest.java b/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerIndexListTest.java
index d5622e00aff..9826f8146c6 100644
--- a/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerIndexListTest.java
+++ b/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerIndexListTest.java
@@ -22,6 +22,7 @@ import java.util.Set;
import java.util.function.Predicate;
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteDataStreamer;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.internal.IgniteEx;
import org.apache.ignite.internal.commandline.CommandHandler;
import org.apache.ignite.internal.commandline.cache.CacheCommands;
@@ -54,7 +55,7 @@ public class GridCommandHandlerIndexListTest extends GridCommandHandlerAbstractT
ignite = startGrids(GRIDS_NUM);
- ignite.cluster().active(true);
+ ignite.cluster().state(ClusterState.ACTIVE);
createAndFillSeveralCaches(ignite);
}
diff --git a/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerIndexRebuildStatusTest.java b/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerIndexRebuildStatusTest.java
index 786c11eb5da..df287d27d52 100644
--- a/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerIndexRebuildStatusTest.java
+++ b/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerIndexRebuildStatusTest.java
@@ -25,6 +25,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.internal.IgniteEx;
import org.apache.ignite.internal.IgniteInternalFuture;
import org.apache.ignite.internal.IgniteInterruptedCheckedException;
@@ -113,7 +114,7 @@ public class GridCommandHandlerIndexRebuildStatusTest extends GridCommandHandler
Ignite ignite = startGrids(GRIDS_NUM);
- ignite.cluster().active(true);
+ ignite.cluster().state(ClusterState.ACTIVE);
createAndFillCache(ignite, "cache1", "group2");
createAndFillCache(ignite, "cache2", "group1");
diff --git a/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerIndexingTest.java b/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerIndexingTest.java
index 147dff301b7..773ff1b51b2 100644
--- a/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerIndexingTest.java
+++ b/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerIndexingTest.java
@@ -138,7 +138,7 @@ public class GridCommandHandlerIndexingTest extends GridCommandHandlerClusterPer
public void runIdleVerifyCheckCrcFailsOnNotIdleCluster(boolean allowOverwrite) throws Exception {
IgniteEx ig = startGrids(2);
- ig.cluster().active(true);
+ ig.cluster().state(ClusterState.ACTIVE);
int cntPreload = 100;
diff --git a/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerInterruptCommandTest.java b/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerInterruptCommandTest.java
index 2464897b6eb..56db6267d7b 100644
--- a/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerInterruptCommandTest.java
+++ b/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerInterruptCommandTest.java
@@ -27,6 +27,7 @@ import org.apache.ignite.IgniteException;
import org.apache.ignite.cache.QueryEntity;
import org.apache.ignite.cache.QueryIndex;
import org.apache.ignite.cache.QueryIndexType;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.DataRegionConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
@@ -187,7 +188,7 @@ public class GridCommandHandlerInterruptCommandTest extends GridCommandHandlerAb
IgniteEx ignite = startGrid(0);
- ignite.cluster().active(true);
+ ignite.cluster().state(ClusterState.ACTIVE);
preloadeData(ignite);
@@ -223,7 +224,7 @@ public class GridCommandHandlerInterruptCommandTest extends GridCommandHandlerAb
IgniteEx ignite = startGrid(0);
- ignite.cluster().active(true);
+ ignite.cluster().state(ClusterState.ACTIVE);
preloadeData(ignite);
@@ -294,7 +295,7 @@ public class GridCommandHandlerInterruptCommandTest extends GridCommandHandlerAb
public void testCancelValidateIndexesClosure() throws Exception {
IgniteEx ignite0 = startGrid(0);
- ignite0.cluster().active(true);
+ ignite0.cluster().state(ClusterState.ACTIVE);
preloadeData(ignite0);
diff --git a/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerSslTest.java b/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerSslTest.java
index 442e6022098..ea260fa0752 100644
--- a/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerSslTest.java
+++ b/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerSslTest.java
@@ -80,7 +80,7 @@ public class GridCommandHandlerSslTest extends GridCommandHandlerClusterPerMetho
Ignite ignite = startGrids(1);
- assertFalse(ignite.cluster().active());
+ assertFalse(ignite.cluster().state().active());
final CommandHandler cmd = new CommandHandler();
@@ -98,9 +98,9 @@ public class GridCommandHandlerSslTest extends GridCommandHandlerClusterPerMetho
assertEquals(expRes, execute(params));
if (expRes == EXIT_CODE_OK)
- assertTrue(ignite.cluster().active());
+ assertTrue(ignite.cluster().state().active());
else
- assertFalse(ignite.cluster().active());
+ assertFalse(ignite.cluster().state().active());
assertEquals(EXIT_CODE_CONNECTION_FAILED, cmd.execute(Arrays.asList("--deactivate", "--yes")));
}
diff --git a/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerTest.java b/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerTest.java
index ba9b972cebd..6e7ce81374e 100644
--- a/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerTest.java
+++ b/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerTest.java
@@ -693,7 +693,7 @@ public class GridCommandHandlerTest extends GridCommandHandlerClusterPerMethodAb
//because cluster is inactive
assertTrue(out.contains("Error has occurred during tag update:"));
- cl.cluster().active(true);
+ cl.cluster().state(ClusterState.ACTIVE);
//because new tag should be non-empty string
assertEquals(EXIT_CODE_INVALID_ARGUMENTS, execute("--change-tag", ""));
@@ -713,19 +713,19 @@ public class GridCommandHandlerTest extends GridCommandHandlerClusterPerMethodAb
public void testDeactivate() throws Exception {
Ignite ignite = startGrids(1);
- assertFalse(ignite.cluster().active());
+ assertFalse(ignite.cluster().state().active());
assertEquals(INACTIVE, ignite.cluster().state());
ignite.cluster().state(ACTIVE);
- assertTrue(ignite.cluster().active());
+ assertTrue(ignite.cluster().state().active());
assertEquals(ACTIVE, ignite.cluster().state());
injectTestSystemOut();
assertEquals(EXIT_CODE_OK, execute("--deactivate"));
- assertFalse(ignite.cluster().active());
+ assertFalse(ignite.cluster().state().active());
assertEquals(INACTIVE, ignite.cluster().state());
assertContains(log, testOut.toString(), "Command deprecated. Use --set-state instead.");
@@ -765,7 +765,7 @@ public class GridCommandHandlerTest extends GridCommandHandlerClusterPerMethodAb
ignite.cluster().state(ACTIVE);
- assertTrue(ignite.cluster().active());
+ assertTrue(ignite.cluster().state().active());
assertEquals(ACTIVE, ignite.cluster().state());
ignite.createCache(new CacheConfiguration<>("non-persistent-cache")
@@ -775,7 +775,7 @@ public class GridCommandHandlerTest extends GridCommandHandlerClusterPerMethodAb
assertEquals(EXIT_CODE_UNEXPECTED_ERROR, execute(cmd));
- assertTrue(ignite.cluster().active());
+ assertTrue(ignite.cluster().state().active());
assertEquals(ACTIVE, ignite.cluster().state());
assertContains(log, testOut.toString(), GridClusterStateProcessor.DATA_LOST_ON_DEACTIVATION_WARNING);
@@ -784,7 +784,7 @@ public class GridCommandHandlerTest extends GridCommandHandlerClusterPerMethodAb
assertEquals(EXIT_CODE_OK, execute(forceCmd));
- assertFalse(ignite.cluster().active());
+ assertFalse(ignite.cluster().state().active());
assertEquals(INACTIVE, ignite.cluster().state());
}
@@ -799,7 +799,7 @@ public class GridCommandHandlerTest extends GridCommandHandlerClusterPerMethodAb
@WithSystemProperty(key = IGNITE_CLUSTER_NAME, value = "TEST_CLUSTER_NAME")
public void testDeactivateWithCheckClusterNameInConfirmationBySystemProperty() throws Exception {
IgniteEx igniteEx = startGrid(0);
- assertFalse(igniteEx.cluster().active());
+ assertFalse(igniteEx.cluster().state().active());
deactivateActiveOrNotClusterWithCheckClusterNameInConfirmation(igniteEx, "TEST_CLUSTER_NAME");
}
@@ -813,7 +813,7 @@ public class GridCommandHandlerTest extends GridCommandHandlerClusterPerMethodAb
@Test
public void testDeactivateWithCheckClusterNameInConfirmationByDefault() throws Exception {
IgniteEx igniteEx = startGrid(0);
- assertFalse(igniteEx.cluster().active());
+ assertFalse(igniteEx.cluster().state().active());
deactivateActiveOrNotClusterWithCheckClusterNameInConfirmation(
igniteEx,
@@ -834,8 +834,8 @@ public class GridCommandHandlerTest extends GridCommandHandlerClusterPerMethodAb
) {
deactivateWithCheckClusterNameInConfirmation(igniteEx, clusterName);
- igniteEx.cluster().active(true);
- assertTrue(igniteEx.cluster().active());
+ igniteEx.cluster().state(ACTIVE);
+ assertTrue(igniteEx.cluster().state().active());
deactivateWithCheckClusterNameInConfirmation(igniteEx, clusterName);
}
@@ -853,7 +853,7 @@ public class GridCommandHandlerTest extends GridCommandHandlerClusterPerMethodAb
injectTestSystemIn(CONFIRM_MSG);
assertEquals(EXIT_CODE_OK, execute(DEACTIVATE.text()));
- assertFalse(igniteEx.cluster().active());
+ assertFalse(igniteEx.cluster().state().active());
assertContains(
log,
@@ -873,7 +873,7 @@ public class GridCommandHandlerTest extends GridCommandHandlerClusterPerMethodAb
Ignite ignite = startGrids(1);
- assertFalse(ignite.cluster().active());
+ assertFalse(ignite.cluster().state().active());
injectTestSystemOut();
@@ -889,9 +889,9 @@ public class GridCommandHandlerTest extends GridCommandHandlerClusterPerMethodAb
assertTrue(out.contains("Cluster ID: " + clId));
assertTrue(out.contains("Cluster tag: " + clTag));
- ignite.cluster().active(true);
+ ignite.cluster().state(ClusterState.ACTIVE);
- assertTrue(ignite.cluster().active());
+ assertTrue(ignite.cluster().state().active());
assertEquals(EXIT_CODE_OK, execute("--state"));
@@ -1037,9 +1037,9 @@ public class GridCommandHandlerTest extends GridCommandHandlerClusterPerMethodAb
hostNames.setAccessible(true);
hostNames.set(ignite.cluster().node(), Arrays.asList("10.19.112.175.hostname"));
- assertFalse(ignite.cluster().active());
+ assertFalse(ignite.cluster().state().active());
- ignite.cluster().active(true);
+ ignite.cluster().state(ACTIVE);
injectTestSystemOut();
@@ -1087,9 +1087,9 @@ public class GridCommandHandlerTest extends GridCommandHandlerClusterPerMethodAb
public void testBaselineCollectCrd() throws Exception {
Ignite ignite = startGrids(2);
- assertFalse(ignite.cluster().active());
+ assertFalse(ignite.cluster().state().active());
- ignite.cluster().active(true);
+ ignite.cluster().state(ClusterState.ACTIVE);
injectTestSystemOut();
@@ -1197,9 +1197,9 @@ public class GridCommandHandlerTest extends GridCommandHandlerClusterPerMethodAb
ignite.cluster().baselineAutoAdjustEnabled(false);
- assertFalse(ignite.cluster().active());
+ assertFalse(ignite.cluster().state().active());
- ignite.cluster().active(true);
+ ignite.cluster().state(ClusterState.ACTIVE);
assertEquals(EXIT_CODE_INVALID_ARGUMENTS, execute("--baseline", "add"));
@@ -1369,9 +1369,9 @@ public class GridCommandHandlerTest extends GridCommandHandlerClusterPerMethodAb
Ignite other = startGrid("nodeToStop");
- assertFalse(ignite.cluster().active());
+ assertFalse(ignite.cluster().state().active());
- ignite.cluster().active(true);
+ ignite.cluster().state(ClusterState.ACTIVE);
String offlineNodeConsId = consistentIds(other);
@@ -1392,9 +1392,9 @@ public class GridCommandHandlerTest extends GridCommandHandlerClusterPerMethodAb
public void testShutdownPolicy() throws Exception {
Ignite ignite = startGrids(1);
- assertFalse(ignite.cluster().active());
+ assertFalse(ignite.cluster().state().active());
- ignite.cluster().active(true);
+ ignite.cluster().state(ClusterState.ACTIVE);
ShutdownPolicy policy = ignite.cluster().shutdownPolicy();
@@ -1416,9 +1416,9 @@ public class GridCommandHandlerTest extends GridCommandHandlerClusterPerMethodAb
public void testShutdownPolicyChange() throws Exception {
Ignite ignite = startGrids(1);
- assertFalse(ignite.cluster().active());
+ assertFalse(ignite.cluster().state().active());
- ignite.cluster().active(true);
+ ignite.cluster().state(ClusterState.ACTIVE);
ShutdownPolicy policyToChange = null;
@@ -1450,21 +1450,21 @@ public class GridCommandHandlerTest extends GridCommandHandlerClusterPerMethodAb
Ignite ignite = startGrids(1);
Ignite other = startGrid("nodeToStop");
- assertFalse(ignite.cluster().active());
+ assertFalse(ignite.cluster().state().active());
String offlineNodeConsId = consistentIds(other);
assertEquals(EXIT_CODE_UNEXPECTED_ERROR, execute("--baseline", "remove", offlineNodeConsId));
- ignite.cluster().active(true);
+ ignite.cluster().state(ClusterState.ACTIVE);
stopGrid("nodeToStop");
assertEquals(2, ignite.cluster().currentBaselineTopology().size());
- ignite.cluster().active(false);
+ ignite.cluster().state(ClusterState.INACTIVE);
- assertFalse(ignite.cluster().active());
+ assertFalse(ignite.cluster().state().active());
injectTestSystemOut();
@@ -1484,9 +1484,9 @@ public class GridCommandHandlerTest extends GridCommandHandlerClusterPerMethodAb
ignite.cluster().baselineAutoAdjustEnabled(false);
- assertFalse(ignite.cluster().active());
+ assertFalse(ignite.cluster().state().active());
- ignite.cluster().active(true);
+ ignite.cluster().state(ClusterState.ACTIVE);
Ignite other = startGrid(2);
@@ -1508,9 +1508,9 @@ public class GridCommandHandlerTest extends GridCommandHandlerClusterPerMethodAb
//It is important to set consistent id to null for force autogeneration.
Ignite ignite1 = startGrid(optimize(getConfiguration(getTestIgniteInstanceName(1)).setConsistentId(null)));
- assertFalse(ignite0.cluster().active());
+ assertFalse(ignite0.cluster().state().active());
- ignite0.cluster().active(true);
+ ignite0.cluster().state(ClusterState.ACTIVE);
Ignite other = startGrid(2);
@@ -1534,9 +1534,9 @@ public class GridCommandHandlerTest extends GridCommandHandlerClusterPerMethodAb
ignite.cluster().baselineAutoAdjustEnabled(false);
- assertFalse(ignite.cluster().active());
+ assertFalse(ignite.cluster().state().active());
- ignite.cluster().active(true);
+ ignite.cluster().state(ClusterState.ACTIVE);
startGrid(2);
@@ -1556,7 +1556,7 @@ public class GridCommandHandlerTest extends GridCommandHandlerClusterPerMethodAb
public void testBaselineAutoAdjustmentAutoRemoveNode() throws Exception {
Ignite ignite = startGrids(3);
- ignite.cluster().active(true);
+ ignite.cluster().state(ClusterState.ACTIVE);
int timeout = 2000;
@@ -1619,7 +1619,7 @@ public class GridCommandHandlerTest extends GridCommandHandlerClusterPerMethodAb
public void testBaselineAutoAdjustmentAutoAddNode() throws Exception {
Ignite ignite = startGrids(1);
- ignite.cluster().active(true);
+ ignite.cluster().state(ACTIVE);
assertEquals(EXIT_CODE_OK, execute("--baseline", "auto_adjust", "enable", "timeout", "2000"));
@@ -1658,7 +1658,7 @@ public class GridCommandHandlerTest extends GridCommandHandlerClusterPerMethodAb
public void testActiveTransactions() throws Exception {
Ignite ignite = startGridsMultiThreaded(2);
- ignite.cluster().active(true);
+ ignite.cluster().state(ACTIVE);
Ignite client = startGrid("client");
@@ -2004,7 +2004,7 @@ public class GridCommandHandlerTest extends GridCommandHandlerClusterPerMethodAb
public void testBaselineAddOnNotActiveCluster() throws Exception {
Ignite ignite = startGrid(1);
- assertFalse(ignite.cluster().active());
+ assertFalse(ignite.cluster().state().active());
String consistentIDs = getTestIgniteInstanceName(1);
@@ -2039,7 +2039,7 @@ public class GridCommandHandlerTest extends GridCommandHandlerClusterPerMethodAb
IgniteEx node = startGrids(2);
- node.cluster().active(true);
+ node.cluster().state(ClusterState.ACTIVE);
IgniteCache<Integer, Integer> cache = node.getOrCreateCache(new CacheConfiguration<Integer, Integer>()
.setAffinity(new RendezvousAffinityFunction(false, 32))
@@ -2093,7 +2093,7 @@ public class GridCommandHandlerTest extends GridCommandHandlerClusterPerMethodAb
Ignite unstable = startGrid("unstable");
- ignite.cluster().active(true);
+ ignite.cluster().state(ClusterState.ACTIVE);
createCacheAndPreload(ignite, 100);
@@ -2136,7 +2136,7 @@ public class GridCommandHandlerTest extends GridCommandHandlerClusterPerMethodAb
unstableNodes.add(ignite(i));
}
- ignite.cluster().active(true);
+ ignite.cluster().state(ClusterState.ACTIVE);
createCacheAndPreload(ignite, 100);
@@ -2221,7 +2221,7 @@ public class GridCommandHandlerTest extends GridCommandHandlerClusterPerMethodAb
private void testCacheIdleVerifyWithCorruptedPartition(String... args) throws Exception {
Ignite ignite = startGrids(2);
- ignite.cluster().active(true);
+ ignite.cluster().state(ClusterState.ACTIVE);
createCacheAndPreload(ignite, 1000);
@@ -2281,7 +2281,7 @@ public class GridCommandHandlerTest extends GridCommandHandlerClusterPerMethodAb
IgniteEx ignite = startGrids(3);
- ignite.cluster().active(true);
+ ignite.cluster().state(ClusterState.ACTIVE);
IgniteCache<Object, Object> cache = ignite.createCache(new CacheConfiguration<>()
.setAffinity(new RendezvousAffinityFunction(false, parts))
@@ -2336,7 +2336,7 @@ public class GridCommandHandlerTest extends GridCommandHandlerClusterPerMethodAb
ignite.cluster().baselineAutoAdjustEnabled(false);
- ignite.cluster().active(true);
+ ignite.cluster().state(ACTIVE);
int parts = 32;
@@ -2369,7 +2369,7 @@ public class GridCommandHandlerTest extends GridCommandHandlerClusterPerMethodAb
public void testCacheSequence() throws Exception {
Ignite ignite = startGrid();
- ignite.cluster().active(true);
+ ignite.cluster().state(ACTIVE);
Ignite client = startGrid("client");
@@ -2435,7 +2435,7 @@ public class GridCommandHandlerTest extends GridCommandHandlerClusterPerMethodAb
ClusterNode node2 = nodes0.get(2);
ClusterNode node3 = nodes0.get(3);
- ignite.cluster().active(true);
+ ignite.cluster().state(ACTIVE);
assertEquals(
EXIT_CODE_OK,
@@ -2644,7 +2644,7 @@ public class GridCommandHandlerTest extends GridCommandHandlerClusterPerMethodAb
public void testKillHangingLocalTransactions() throws Exception {
Ignite ignite = startGridsMultiThreaded(2);
- ignite.cluster().active(true);
+ ignite.cluster().state(ACTIVE);
Ignite client = startGrid("client");
@@ -2718,7 +2718,7 @@ public class GridCommandHandlerTest extends GridCommandHandlerClusterPerMethodAb
public void setConsistenceIdsWithOfflineBaselineNode() throws Exception {
Ignite ignite = startGrids(2);
- ignite.cluster().active(true);
+ ignite.cluster().state(ACTIVE);
ignite(0).createCache(defaultCacheConfiguration().setNodeFilter(
(IgnitePredicate<ClusterNode>)node -> node.attribute("some-attr") != null));
@@ -2734,7 +2734,7 @@ public class GridCommandHandlerTest extends GridCommandHandlerClusterPerMethodAb
public void testCacheIdleVerifyPrintLostPartitions() throws Exception {
IgniteEx ignite = startGrids(3);
- ignite.cluster().active(true);
+ ignite.cluster().state(ACTIVE);
ignite.createCache(new CacheConfiguration<>(DEFAULT_CACHE_NAME)
.setAffinity(new RendezvousAffinityFunction(false, 16))
diff --git a/modules/core/src/main/java/org/apache/ignite/Ignite.java b/modules/core/src/main/java/org/apache/ignite/Ignite.java
index 14567aaefe1..c75a20bdecf 100644
--- a/modules/core/src/main/java/org/apache/ignite/Ignite.java
+++ b/modules/core/src/main/java/org/apache/ignite/Ignite.java
@@ -24,6 +24,7 @@ import javax.cache.CacheException;
import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.cache.affinity.Affinity;
import org.apache.ignite.cluster.ClusterGroup;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.AtomicConfiguration;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.CollectionConfiguration;
@@ -687,7 +688,7 @@ public interface Ignite extends AutoCloseable {
* Checks Ignite grid is active or not active.
*
* @return {@code True} if grid is active. {@code False} If grid is not active.
- * @deprecated Use {@link IgniteCluster#active()} instead.
+ * @deprecated Use {@link IgniteCluster#state()} instead.
*/
@Deprecated
public boolean active();
@@ -700,7 +701,7 @@ public interface Ignite extends AutoCloseable {
*
* @param active If {@code True} start activation process. If {@code False} start deactivation process.
* @throws IgniteException If there is an already started transaction or lock in the same thread.
- * @deprecated Use {@link IgniteCluster#active(boolean)} instead.
+ * @deprecated Use {@link IgniteCluster#state(ClusterState)} instead.
*/
@Deprecated
public void active(boolean active);
diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/WALMode.java b/modules/core/src/main/java/org/apache/ignite/configuration/WALMode.java
index 10471cff784..f1e2b68d487 100644
--- a/modules/core/src/main/java/org/apache/ignite/configuration/WALMode.java
+++ b/modules/core/src/main/java/org/apache/ignite/configuration/WALMode.java
@@ -17,7 +17,8 @@
package org.apache.ignite.configuration;
-import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCluster;
+import org.apache.ignite.cluster.ClusterState;
import org.jetbrains.annotations.Nullable;
/**
@@ -45,7 +46,7 @@ public enum WALMode {
/**
* WAL is disabled. Data is guaranteed to be persisted on disk only in case of graceful cluster shutdown using
- * {@link Ignite#active(boolean)} method. If an Ignite node is terminated in NONE mode abruptly, it is likely
+ * {@link IgniteCluster#state(ClusterState)} method. If an Ignite node is terminated in NONE mode abruptly, it is likely
* that the data stored on disk is corrupted and work directory will need to be cleared for a node restart.
*/
NONE,
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
index 58b01a21c31..0da2c0d14e7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
@@ -2777,7 +2777,7 @@ public class IgniteKernal implements IgniteEx, Externalizable {
/** {@inheritDoc} */
@Override public void active(boolean active) {
- cluster().active(active);
+ cluster().state(active ? ClusterState.ACTIVE : ClusterState.INACTIVE);
}
/** */
@@ -3109,7 +3109,7 @@ public class IgniteKernal implements IgniteEx, Externalizable {
if (!ctx.state().publicApiActiveState(true)) {
throw new IgniteException("Can not perform the operation because the cluster is inactive. Note, that " +
"the cluster is considered inactive by default if Ignite Persistent Store is used to let all the nodes " +
- "join the cluster. To activate the cluster call Ignite.active(true).");
+ "join the cluster. To activate the cluster call Ignite.cluster().state(ClusterState.ACTIVE).");
}
}
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteMXBeanImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteMXBeanImpl.java
index 924fe230269..286f05f4216 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteMXBeanImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteMXBeanImpl.java
@@ -53,7 +53,7 @@ public class IgniteMXBeanImpl implements IgniteMXBean {
/** {@inheritDoc} */
@Override public boolean active() {
- return kernal.active();
+ return kernal.cluster().state().active();
}
/** {@inheritDoc} */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
index 626acf1eb05..cb47fe8ce42 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
@@ -2170,7 +2170,7 @@ public class IgnitionEx {
}
}
- if (shutdown == ShutdownPolicy.GRACEFUL && !grid.context().clientNode() && grid.cluster().active()) {
+ if (shutdown == ShutdownPolicy.GRACEFUL && !grid.context().clientNode() && grid.cluster().state().active()) {
delayedShutdown = true;
if (log.isInfoEnabled())
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/cluster/IgniteClusterImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/cluster/IgniteClusterImpl.java
index 71a8f6f8dfa..9611a80a8e7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/cluster/IgniteClusterImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/cluster/IgniteClusterImpl.java
@@ -731,7 +731,8 @@ public class IgniteClusterImpl extends ClusterGroupAdapter implements IgniteClus
if (!ctx.state().publicApiActiveState(true)) {
throw new IgniteCheckedException(
- "Can not change cluster tag on inactive cluster. To activate the cluster call Ignite.active(true)."
+ "Can not change cluster tag on inactive cluster. To activate the cluster call " +
+ "Ignite.cluster().state(ClusterState.ACTIVE)."
);
}
diff --git 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
index 01ab17de23f..2a733d942b8 100644
--- 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
@@ -815,7 +815,7 @@ public class GridDiscoveryManager extends GridManagerAdapter<DiscoverySpi> {
locJoin.onDone(new DiscoveryLocalJoinData(discoEvt,
discoCache,
transitionWaitFut,
- ctx.state().clusterState().active()));
+ ctx.state().clusterState().state().active()));
return;
}
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/encryption/GridEncryptionManager.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/encryption/GridEncryptionManager.java
index 7ad3aa936f9..8e1f5be7b7e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/encryption/GridEncryptionManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/encryption/GridEncryptionManager.java
@@ -677,7 +677,7 @@ public class GridEncryptionManager extends GridManagerAdapter<EncryptionSpi> imp
// WAL is unavailable for write on the inactive cluster. Master key change will not be logged and group keys
// can be partially re-encrypted in case of node stop without the possibility of recovery.
- if (!ctx.state().clusterState().active()) {
+ if (!ctx.state().clusterState().state().active()) {
return new IgniteFinishedFutureImpl<>(new IgniteException("Master key change was rejected. " +
"The cluster is inactive."));
}
@@ -1589,7 +1589,7 @@ public class GridEncryptionManager extends GridManagerAdapter<EncryptionSpi> imp
if (masterKeyChangeRequest == null || !masterKeyChangeRequest.equals(req))
return new GridFinishedFuture<>(new IgniteException("Unknown master key change was rejected."));
- if (!ctx.state().clusterState().active()) {
+ if (!ctx.state().clusterState().state().active()) {
masterKeyChangeRequest = null;
return new GridFinishedFuture<>(new IgniteException("Master key change was rejected. " +
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/authentication/IgniteAuthenticationProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/authentication/IgniteAuthenticationProcessor.java
index 735ee838619..d0df0f52526 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/authentication/IgniteAuthenticationProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/authentication/IgniteAuthenticationProcessor.java
@@ -444,7 +444,7 @@ public class IgniteAuthenticationProcessor extends GridProcessorAdapter implemen
if (!ctx.state().publicApiActiveState(true)) {
throw new IgniteException("Can not perform the operation because the cluster is inactive. Note, that " +
"the cluster is considered inactive by default if Ignite Persistent Store is used to let all the nodes " +
- "join the cluster. To activate the cluster call Ignite.active(true).");
+ "join the cluster. To activate the cluster call Ignite.cluster().state(ClusterState.ACTIVE).");
}
}
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheAffinitySharedManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheAffinitySharedManager.java
index fda6598653d..2dd1885b41a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheAffinitySharedManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheAffinitySharedManager.java
@@ -178,7 +178,7 @@ public class CacheAffinitySharedManager<K, V> extends GridCacheSharedManagerAdap
if (type == EVT_NODE_JOINED && node.isLocal())
lastAffVer = null;
- if ((state.transition() || !state.active()) &&
+ if ((state.transition() || !state.state().active()) &&
!DiscoveryCustomEvent.requiresCentralizedAffinityAssignment(customMsg))
return;
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/ClusterCachesInfo.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/ClusterCachesInfo.java
index 9442873978d..7a8eb93d118 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/ClusterCachesInfo.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/ClusterCachesInfo.java
@@ -614,7 +614,7 @@ public class ClusterCachesInfo {
public boolean onCacheChangeRequested(DynamicCacheChangeBatch batch, AffinityTopologyVersion topVer) {
DiscoveryDataClusterState state = ctx.state().clusterState();
- if (state.active() && !state.transition()) {
+ if (state.state().active() && !state.transition()) {
Set<IgniteUuid> restartIds = new HashSet<>(F.viewReadOnly(
batch.requests(), DynamicCacheChangeRequest::restartId, req -> req.start() && req.restartId() != null));
@@ -2058,7 +2058,7 @@ public class ClusterCachesInfo {
private void processClientReconnectData(CacheClientReconnectDiscoveryData clientData, UUID clientNodeId) {
DiscoveryDataClusterState state = ctx.state().clusterState();
- if (state.active() && !state.transition()) {
+ if (state.state().active() && !state.transition()) {
for (CacheClientReconnectDiscoveryData.CacheInfo cacheInfo : clientData.clientCaches().values()) {
String cacheName = cacheInfo.config().getName();
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cluster/PlatformClusterGroup.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cluster/PlatformClusterGroup.java
index e2b8e5b2238..68258e550ab 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cluster/PlatformClusterGroup.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cluster/PlatformClusterGroup.java
@@ -27,6 +27,7 @@ import org.apache.ignite.MemoryMetrics;
import org.apache.ignite.binary.BinaryRawWriter;
import org.apache.ignite.cluster.ClusterMetrics;
import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.internal.binary.BinaryRawReaderEx;
import org.apache.ignite.internal.binary.BinaryRawWriterEx;
import org.apache.ignite.internal.cluster.ClusterGroupEx;
@@ -459,13 +460,13 @@ public class PlatformClusterGroup extends PlatformAbstractTarget {
}
case OP_SET_ACTIVE: {
- prj.ignite().active(val == TRUE);
+ prj.ignite().cluster().state(val == TRUE ? ClusterState.ACTIVE : ClusterState.INACTIVE);
return TRUE;
}
case OP_IS_ACTIVE: {
- return prj.ignite().active() ? TRUE : FALSE;
+ return prj.ignite().cluster().state().active() ? TRUE : FALSE;
}
}
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandler.java
index 82ecf77b9d2..3e46c80290b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandler.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandler.java
@@ -1104,7 +1104,7 @@ public class GridCacheCommandHandler extends GridRestCommandHandlerAdapter {
@Override public Collection<GridCacheSqlMetadata> execute() {
try {
if (future == null) {
- if (!ignite.cluster().active())
+ if (!ignite.cluster().state().active())
return Collections.emptyList();
IgniteInternalCache<?, ?> cache = null;
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cluster/GridBaselineCommandHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cluster/GridBaselineCommandHandler.java
index ad9e6cba621..edd13f1a995 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cluster/GridBaselineCommandHandler.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cluster/GridBaselineCommandHandler.java
@@ -164,7 +164,7 @@ public class GridBaselineCommandHandler extends GridRestCommandHandlerAdapter {
Collection<? extends BaselineNode> srvrs = cluster.forServers().nodes();
- return new GridBaselineCommandResponse(cluster.active(), cluster.topologyVersion(), currentBaseLine(), srvrs);
+ return new GridBaselineCommandResponse(cluster.state().active(), cluster.topologyVersion(), currentBaseLine(), srvrs);
}
/**
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/baseline/VisorBaselineTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/baseline/VisorBaselineTask.java
index d06ebff2690..d013189acb3 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/baseline/VisorBaselineTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/baseline/VisorBaselineTask.java
@@ -85,7 +85,7 @@ public class VisorBaselineTask extends VisorOneNodeTask<VisorBaselineTaskArg, Vi
BaselineAutoAdjustStatus adjustStatus = cluster.baselineAutoAdjustStatus();
return new VisorBaselineTaskResult(
- ignite.cluster().active(),
+ ignite.cluster().state().active(),
cluster.topologyVersion(),
F.isEmpty(baseline) ? null : baseline,
srvrs,
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/baseline/VisorBaselineViewTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/baseline/VisorBaselineViewTask.java
index 47e567ca3f0..8ae1483a5fe 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/baseline/VisorBaselineViewTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/baseline/VisorBaselineViewTask.java
@@ -66,7 +66,7 @@ public class VisorBaselineViewTask extends VisorOneNodeTask<Void, VisorBaselineT
BaselineAutoAdjustStatus adjustStatus = cluster.baselineAutoAdjustStatus();
return new VisorBaselineTaskResult(
- ignite.cluster().active(),
+ ignite.cluster().state().active(),
cluster.topologyVersion(),
cluster.currentBaselineTopology(),
cluster.forServers().nodes(),
diff --git a/modules/core/src/test/java/org/apache/ignite/cache/CircledRebalanceTest.java b/modules/core/src/test/java/org/apache/ignite/cache/CircledRebalanceTest.java
index ad0da5a35d0..587ac90acdc 100644
--- a/modules/core/src/test/java/org/apache/ignite/cache/CircledRebalanceTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/cache/CircledRebalanceTest.java
@@ -25,6 +25,7 @@ import org.apache.ignite.IgniteDataStreamer;
import org.apache.ignite.IgniteSystemProperties;
import org.apache.ignite.ShutdownPolicy;
import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.DataRegionConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
@@ -122,7 +123,7 @@ public class CircledRebalanceTest extends GridCommonAbstractTest {
IgniteEx ignite0 = startGrids(nodes);
- ignite0.cluster().active(true);
+ ignite0.cluster().state(ClusterState.ACTIVE);
loadData(true);
diff --git a/modules/core/src/test/java/org/apache/ignite/cache/ClientCreateCacheGroupOnJoinNodeMapsTest.java b/modules/core/src/test/java/org/apache/ignite/cache/ClientCreateCacheGroupOnJoinNodeMapsTest.java
index 389fd93ae72..8b9c2473b8e 100644
--- a/modules/core/src/test/java/org/apache/ignite/cache/ClientCreateCacheGroupOnJoinNodeMapsTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/cache/ClientCreateCacheGroupOnJoinNodeMapsTest.java
@@ -18,6 +18,7 @@
package org.apache.ignite.cache;
import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.internal.IgniteEx;
import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionFullMap;
@@ -69,7 +70,7 @@ public class ClientCreateCacheGroupOnJoinNodeMapsTest extends GridCommonAbstract
public void testNodeMapsVolatile() throws Exception {
final IgniteEx srv = startGrids(2);
- srv.cluster().active(true);
+ srv.cluster().state(ClusterState.ACTIVE);
awaitPartitionMapExchange();
@@ -84,6 +85,6 @@ public class ClientCreateCacheGroupOnJoinNodeMapsTest extends GridCommonAbstract
assertEquals(2, map0.size());
assertEquals(2, map1.size());
- srv.cluster().active(false);
+ srv.cluster().state(ClusterState.INACTIVE);
}
}
diff --git a/modules/core/src/test/java/org/apache/ignite/cache/NotOptimizedRebalanceTest.java b/modules/core/src/test/java/org/apache/ignite/cache/NotOptimizedRebalanceTest.java
index 5bc63d5d808..73f688122fb 100644
--- a/modules/core/src/test/java/org/apache/ignite/cache/NotOptimizedRebalanceTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/cache/NotOptimizedRebalanceTest.java
@@ -22,6 +22,7 @@ import java.util.Map;
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteDataStreamer;
import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.DataRegionConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
@@ -134,7 +135,7 @@ public class NotOptimizedRebalanceTest extends GridCommonAbstractTest {
IgniteEx ignite0 = startGrids(NODES_CNT);
- ignite0.cluster().active(true);
+ ignite0.cluster().state(ClusterState.ACTIVE);
ignite0.cluster().baselineAutoAdjustEnabled(false);
diff --git a/modules/core/src/test/java/org/apache/ignite/cache/RebalanceAfterResettingLostPartitionTest.java b/modules/core/src/test/java/org/apache/ignite/cache/RebalanceAfterResettingLostPartitionTest.java
index 2e858905215..e4f223743e6 100644
--- a/modules/core/src/test/java/org/apache/ignite/cache/RebalanceAfterResettingLostPartitionTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/cache/RebalanceAfterResettingLostPartitionTest.java
@@ -22,6 +22,7 @@ import java.util.UUID;
import java.util.concurrent.atomic.AtomicInteger;
import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction;
import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
@@ -104,7 +105,7 @@ public class RebalanceAfterResettingLostPartitionTest extends GridCommonAbstract
public void testRebalanceAfterPartitionsWereLost() throws Exception {
startGrids(2);
- grid(0).cluster().active(true);
+ grid(0).cluster().state(ClusterState.ACTIVE);
for (int j = 0; j < CACHE_SIZE; j++)
grid(0).cache(CACHE_NAME).put(j, "Value" + j);
diff --git a/modules/core/src/test/java/org/apache/ignite/cache/RebalanceCancellationTest.java b/modules/core/src/test/java/org/apache/ignite/cache/RebalanceCancellationTest.java
index 6bfb82c80fb..f5aba5e4505 100644
--- a/modules/core/src/test/java/org/apache/ignite/cache/RebalanceCancellationTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/cache/RebalanceCancellationTest.java
@@ -386,7 +386,7 @@ public class RebalanceCancellationTest extends GridCommonAbstractTest {
IgniteEx ignite0 = startGrids(NODES_CNT);
- ignite0.cluster().active(true);
+ ignite0.cluster().state(ClusterState.ACTIVE);
ignite0.cluster().baselineAutoAdjustEnabled(false);
@@ -455,7 +455,7 @@ public class RebalanceCancellationTest extends GridCommonAbstractTest {
IgniteEx ignite0 = startGrids(NODES_CNT);
IgniteEx filteredNode = startGrid(getTestIgniteInstanceName(NODES_CNT) + FILTERED_NODE_SUFFIX);
- ignite0.cluster().active(true);
+ ignite0.cluster().state(ClusterState.ACTIVE);
grid(1).close();
diff --git a/modules/core/src/test/java/org/apache/ignite/cache/RebalanceCompleteDuringExchangeTest.java b/modules/core/src/test/java/org/apache/ignite/cache/RebalanceCompleteDuringExchangeTest.java
index 242a8e795f9..bcc631c29fe 100644
--- a/modules/core/src/test/java/org/apache/ignite/cache/RebalanceCompleteDuringExchangeTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/cache/RebalanceCompleteDuringExchangeTest.java
@@ -19,6 +19,7 @@ package org.apache.ignite.cache;
import org.apache.ignite.IgniteCache;
import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.internal.IgniteEx;
@@ -55,7 +56,7 @@ public class RebalanceCompleteDuringExchangeTest extends GridCommonAbstractTest
public void testRebalance() throws Exception {
IgniteEx ignite0 = startGrid(0);
- ignite0.cluster().active(true);
+ ignite0.cluster().state(ClusterState.ACTIVE);
IgniteCache cache = ignite0.cache(DEFAULT_CACHE_NAME);
diff --git a/modules/core/src/test/java/org/apache/ignite/cache/ResetLostPartitionTest.java b/modules/core/src/test/java/org/apache/ignite/cache/ResetLostPartitionTest.java
index 37accba300e..d403a5b6e06 100644
--- a/modules/core/src/test/java/org/apache/ignite/cache/ResetLostPartitionTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/cache/ResetLostPartitionTest.java
@@ -26,6 +26,7 @@ import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteDataStreamer;
import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction;
import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.DataRegionConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
@@ -146,7 +147,7 @@ public class ResetLostPartitionTest extends GridCommonAbstractTest {
private void doRebalanceAfterPartitionsWereLost(boolean reactivateGridBeforeResetPart) throws Exception {
startGrids(3);
- grid(0).cluster().active(true);
+ grid(0).cluster().state(ClusterState.ACTIVE);
for (String cacheName : CACHE_NAMES) {
try (IgniteDataStreamer<Object, Object> st = grid(0).dataStreamer(cacheName)) {
@@ -215,8 +216,8 @@ public class ResetLostPartitionTest extends GridCommonAbstractTest {
}
if (reactivateGridBeforeResetPart) {
- grid(0).cluster().active(false);
- grid(0).cluster().active(true);
+ grid(0).cluster().state(ClusterState.INACTIVE);
+ grid(0).cluster().state(ClusterState.ACTIVE);
}
// Try to reset lost partitions.
diff --git a/modules/core/src/test/java/org/apache/ignite/cache/store/StoreArrayKeyTest.java b/modules/core/src/test/java/org/apache/ignite/cache/store/StoreArrayKeyTest.java
index 52d3427a8e0..e1f204fc005 100644
--- a/modules/core/src/test/java/org/apache/ignite/cache/store/StoreArrayKeyTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/cache/store/StoreArrayKeyTest.java
@@ -24,6 +24,7 @@ import java.util.Iterator;
import javax.cache.Cache;
import org.apache.ignite.IgniteCache;
import org.apache.ignite.cache.CacheWriteSynchronizationMode;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.DataRegionConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
@@ -126,7 +127,7 @@ public class StoreArrayKeyTest extends GridCommonAbstractTest {
node1 = startGrid(0);
node2 = startGrid(1);
- node1.cluster().active(true);
+ node1.cluster().state(ClusterState.ACTIVE);
}
/**
diff --git a/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoWriteBehindStoreWithCoalescingTest.java b/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoWriteBehindStoreWithCoalescingTest.java
index 73de14b453e..b47bd80cc40 100644
--- a/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoWriteBehindStoreWithCoalescingTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoWriteBehindStoreWithCoalescingTest.java
@@ -39,6 +39,7 @@ import org.apache.ignite.cache.store.jdbc.dialect.H2Dialect;
import org.apache.ignite.cache.store.jdbc.model.TestJdbcPojoDataSourceFactory;
import org.apache.ignite.cache.store.jdbc.model.TestJdbcPojoStoreFactoryWithHangWriteAll;
import org.apache.ignite.cache.store.jdbc.model.TestPojo;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.DataRegionConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
@@ -447,7 +448,7 @@ public class CacheJdbcPojoWriteBehindStoreWithCoalescingTest extends GridCommonA
public void updateAndReadWithCoalescingSameKey() throws Exception {
Ignite ignite = startGrid(0);
- ignite.cluster().active(true);
+ ignite.cluster().state(ClusterState.ACTIVE);
IgniteCache<Integer, TestPojo> cache = grid(0).cache("TEST_CACHE");
@@ -524,7 +525,7 @@ public class CacheJdbcPojoWriteBehindStoreWithCoalescingTest extends GridCommonA
public void readWithCoalescing() throws Exception {
Ignite ignite = startGrid(0);
- ignite.cluster().active(true);
+ ignite.cluster().state(ClusterState.ACTIVE);
IgniteCache<Integer, TestPojo> cache = grid(0).cache("TEST_CACHE");
@@ -601,7 +602,7 @@ public class CacheJdbcPojoWriteBehindStoreWithCoalescingTest extends GridCommonA
public void writeAllWithCoalescing() throws Exception {
Ignite ignite = startGrid(0);
- ignite.cluster().active(true);
+ ignite.cluster().state(ClusterState.ACTIVE);
IgniteCache<Integer, TestPojo> cache = grid(0).cache("TEST_CACHE");
diff --git a/modules/core/src/test/java/org/apache/ignite/events/ClusterActivationStartedEventTest.java b/modules/core/src/test/java/org/apache/ignite/events/ClusterActivationStartedEventTest.java
index 7f9a862de0b..574864ff2a5 100644
--- a/modules/core/src/test/java/org/apache/ignite/events/ClusterActivationStartedEventTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/events/ClusterActivationStartedEventTest.java
@@ -84,8 +84,8 @@ public class ClusterActivationStartedEventTest extends GridCommonAbstractTest {
EventType.EVT_CLUSTER_STATE_CHANGE_STARTED
);
- ignite.cluster().active(false);
- ignite.cluster().active(true);
+ ignite.cluster().state(ClusterState.INACTIVE);
+ ignite.cluster().state(ClusterState.ACTIVE);
assertEquals(0, evtsTriggered.get());
}
@@ -100,7 +100,7 @@ public class ClusterActivationStartedEventTest extends GridCommonAbstractTest {
AtomicBoolean deactivationFinished = new AtomicBoolean();
IgniteEx ignite = startGrid(0);
- ignite.cluster().active(false);
+ ignite.cluster().state(ClusterState.INACTIVE);
ignite.events().localListen(
event -> {
@@ -149,7 +149,7 @@ public class ClusterActivationStartedEventTest extends GridCommonAbstractTest {
EventType.EVT_CLUSTER_DEACTIVATED
);
- ignite.cluster().active(true);
+ ignite.cluster().state(ClusterState.ACTIVE);
assertTrue(activationStarted.get());
assertTrue(GridTestUtils.waitForCondition(activationFinished::get, 5_000));
@@ -158,10 +158,10 @@ public class ClusterActivationStartedEventTest extends GridCommonAbstractTest {
activationStarted.set(false);
activationFinished.set(false);
- ignite.cluster().active(true);
+ ignite.cluster().state(ClusterState.ACTIVE);
assertFalse(activationStarted.get());
- ignite.cluster().active(false);
+ ignite.cluster().state(ClusterState.INACTIVE);
assertTrue(deactivationStarted.get());
assertTrue(GridTestUtils.waitForCondition(deactivationFinished::get, 5_000));
@@ -170,7 +170,7 @@ public class ClusterActivationStartedEventTest extends GridCommonAbstractTest {
deactivationStarted.set(false);
deactivationFinished.set(false);
- ignite.cluster().active(false);
+ ignite.cluster().state(ClusterState.INACTIVE);
assertFalse(deactivationStarted.get());
}
@@ -184,7 +184,7 @@ public class ClusterActivationStartedEventTest extends GridCommonAbstractTest {
AtomicBoolean deactivationFinished = new AtomicBoolean();
IgniteEx ignite = startGrid(0);
- ignite.cluster().active(false);
+ ignite.cluster().state(ClusterState.INACTIVE);
startGrid(1);
@@ -223,7 +223,7 @@ public class ClusterActivationStartedEventTest extends GridCommonAbstractTest {
EventType.EVT_CLUSTER_DEACTIVATED
);
- ignite.cluster().active(true);
+ ignite.cluster().state(ClusterState.ACTIVE);
assertTrue(GridTestUtils.waitForCondition(activationStarted::get, 5_000));
assertTrue(GridTestUtils.waitForCondition(activationFinished::get, 5_000));
@@ -232,7 +232,7 @@ public class ClusterActivationStartedEventTest extends GridCommonAbstractTest {
activationStarted.set(false);
activationFinished.set(false);
- ignite.cluster().active(false);
+ ignite.cluster().state(ClusterState.INACTIVE);
assertTrue(GridTestUtils.waitForCondition(deactivationStarted::get, 5_000));
assertTrue(GridTestUtils.waitForCondition(deactivationFinished::get, 5_000));
diff --git a/modules/core/src/test/java/org/apache/ignite/failure/FailureHandlingConfigurationTest.java b/modules/core/src/test/java/org/apache/ignite/failure/FailureHandlingConfigurationTest.java
index e7e4dfe247a..151804ed4c5 100644
--- a/modules/core/src/test/java/org/apache/ignite/failure/FailureHandlingConfigurationTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/failure/FailureHandlingConfigurationTest.java
@@ -19,6 +19,7 @@ package org.apache.ignite.failure;
import java.util.concurrent.CountDownLatch;
import org.apache.ignite.Ignite;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.DataRegionConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
@@ -110,7 +111,7 @@ public class FailureHandlingConfigurationTest extends GridCommonAbstractTest {
IgniteEx ignite = startGrid(0);
- ignite.cluster().active(true);
+ ignite.cluster().state(ClusterState.ACTIVE);
WorkersRegistry reg = ignite.context().workersRegistry();
@@ -135,7 +136,7 @@ public class FailureHandlingConfigurationTest extends GridCommonAbstractTest {
IgniteEx ignite = startGrid(0);
- ignite.cluster().active(true);
+ ignite.cluster().state(ClusterState.ACTIVE);
WorkersRegistry reg = ignite.context().workersRegistry();
@@ -160,7 +161,7 @@ public class FailureHandlingConfigurationTest extends GridCommonAbstractTest {
IgniteEx ignite = startGrid(0);
- ignite.cluster().active(true);
+ ignite.cluster().state(ClusterState.ACTIVE);
WorkersRegistry reg = ignite.context().workersRegistry();
@@ -187,7 +188,7 @@ public class FailureHandlingConfigurationTest extends GridCommonAbstractTest {
IgniteEx ignite = startGrid(0);
- ignite.cluster().active(true);
+ ignite.cluster().state(ClusterState.ACTIVE);
WorkersRegistry reg = ignite.context().workersRegistry();
@@ -216,7 +217,7 @@ public class FailureHandlingConfigurationTest extends GridCommonAbstractTest {
public void testMBeanParamsChanging() throws Exception {
IgniteEx ignite = startGrid(0);
- ignite.cluster().active(true);
+ ignite.cluster().state(ClusterState.ACTIVE);
FailureHandlingMxBean mBean = getMBean();
diff --git a/modules/core/src/test/java/org/apache/ignite/failure/IoomFailureHandlerTest.java b/modules/core/src/test/java/org/apache/ignite/failure/IoomFailureHandlerTest.java
index 09e1e650130..1049ab5b15d 100644
--- a/modules/core/src/test/java/org/apache/ignite/failure/IoomFailureHandlerTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/failure/IoomFailureHandlerTest.java
@@ -20,6 +20,7 @@ package org.apache.ignite.failure;
import org.apache.ignite.IgniteCache;
import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.CacheMode;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.DataRegionConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
@@ -143,7 +144,7 @@ public class IoomFailureHandlerTest extends AbstractFailureHandlerTest {
try {
if (pds)
- ignite0.cluster().active(true);
+ ignite0.cluster().state(ClusterState.ACTIVE);
IgniteCache<Integer, Object> cache0 = ignite0.getOrCreateCache(DEFAULT_CACHE_NAME);
IgniteCache<Integer, Object> cache1 = ignite1.getOrCreateCache(DEFAULT_CACHE_NAME);
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/ClusterBaselineNodesMetricsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/ClusterBaselineNodesMetricsSelfTest.java
index 37fa4fcafad..6cfa36ab68c 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/ClusterBaselineNodesMetricsSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/ClusterBaselineNodesMetricsSelfTest.java
@@ -19,6 +19,7 @@ package org.apache.ignite.internal;
import java.util.Collection;
import org.apache.ignite.cluster.BaselineNode;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.DataRegionConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
@@ -62,7 +63,7 @@ public class ClusterBaselineNodesMetricsSelfTest extends GridCommonAbstractTest
MetricRegistry mreg = ignite0.context().metric().registry(CLUSTER_METRICS);
- ignite0.cluster().active(true);
+ ignite0.cluster().state(ClusterState.ACTIVE);
// Added 2 server nodes to baseline.
resetBlt();
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/DiagnosticLogForPartitionStatesTest.java b/modules/core/src/test/java/org/apache/ignite/internal/DiagnosticLogForPartitionStatesTest.java
index f62a763c615..d2085db704d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/DiagnosticLogForPartitionStatesTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/DiagnosticLogForPartitionStatesTest.java
@@ -30,6 +30,7 @@ import javax.cache.expiry.AccessedExpiryPolicy;
import javax.cache.expiry.Duration;
import javax.cache.expiry.EternalExpiryPolicy;
import org.apache.ignite.IgniteCache;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.DataRegionConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
@@ -165,7 +166,7 @@ public class DiagnosticLogForPartitionStatesTest extends GridCommonAbstractTest
IgniteEx node2 = startGrid(1);
- node1.cluster().active(true);
+ node1.cluster().state(ClusterState.ACTIVE);
List<IgniteCache<Integer, Integer>> caches = cfgs.stream()
.map(cfg -> node1.getOrCreateCache(cfg)).collect(Collectors.toList());
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridNodeMetricsLogPdsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridNodeMetricsLogPdsSelfTest.java
index 0910b101d38..5797c6ec8e1 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridNodeMetricsLogPdsSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridNodeMetricsLogPdsSelfTest.java
@@ -17,6 +17,7 @@
package org.apache.ignite.internal;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.DataRegionConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
@@ -51,7 +52,7 @@ public class GridNodeMetricsLogPdsSelfTest extends GridNodeMetricsLogSelfTest {
super.beforeTest();
- grid(0).cluster().active(true);
+ grid(0).cluster().state(ClusterState.ACTIVE);
}
/** {@inheritDoc} */
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/ThreadNameValidationTest.java b/modules/core/src/test/java/org/apache/ignite/internal/ThreadNameValidationTest.java
index cac45bdb5f6..bb9a23bc447 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/ThreadNameValidationTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/ThreadNameValidationTest.java
@@ -28,6 +28,7 @@ import java.util.concurrent.atomic.AtomicLong;
import java.util.stream.Collectors;
import org.apache.ignite.IgniteCache;
import org.apache.ignite.IgniteSystemProperties;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.DataRegionConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
@@ -156,7 +157,7 @@ public class ThreadNameValidationTest extends GridCommonAbstractTest {
validateThreadNames();
IgniteEx ignite = startGrids(1);
- ignite.active(true);
+ ignite.cluster().state(ClusterState.ACTIVE);
IgniteCache<Object, Object> cache = ignite.createCache(DEFAULT_CACHE_NAME);
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/cluster/IgniteClusterIdTagTest.java b/modules/core/src/test/java/org/apache/ignite/internal/cluster/IgniteClusterIdTagTest.java
index b0934e7e797..11ebde86312 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/cluster/IgniteClusterIdTagTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/cluster/IgniteClusterIdTagTest.java
@@ -23,6 +23,7 @@ import java.util.concurrent.atomic.AtomicReference;
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.IgniteCluster;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.DataRegionConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
@@ -173,7 +174,7 @@ public class IgniteClusterIdTagTest extends GridCommonAbstractTest {
IgniteEx ig0 = startGrid(0);
- ig0.cluster().active(true);
+ ig0.cluster().state(ClusterState.ACTIVE);
UUID id0 = ig0.cluster().id();
@@ -310,7 +311,7 @@ public class IgniteClusterIdTagTest extends GridCommonAbstractTest {
String tag1 = ig1.cluster().tag();
- ig0.cluster().active(true);
+ ig0.cluster().state(ClusterState.ACTIVE);
stopAllGrids();
@@ -320,7 +321,7 @@ public class IgniteClusterIdTagTest extends GridCommonAbstractTest {
assertEquals(tag1, ig0.cluster().tag());
- ig1.cluster().active(true);
+ ig1.cluster().state(ClusterState.ACTIVE);
IgniteEx cl0 = startGrid("client0");
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/encryption/AbstractEncryptionTest.java b/modules/core/src/test/java/org/apache/ignite/internal/encryption/AbstractEncryptionTest.java
index 54740a106c0..6d2ec57195f 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/encryption/AbstractEncryptionTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/encryption/AbstractEncryptionTest.java
@@ -36,6 +36,7 @@ import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCache;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.IgniteDataStreamer;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.DataRegionConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
@@ -257,7 +258,7 @@ public abstract class AbstractEncryptionTest extends GridCommonAbstractTest {
IgniteEx grid1 = startGrid(GRID_1);
- grid0.cluster().active(true);
+ grid0.cluster().state(ClusterState.ACTIVE);
awaitPartitionMapExchange();
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/encryption/EncryptedCacheCreateTest.java b/modules/core/src/test/java/org/apache/ignite/internal/encryption/EncryptedCacheCreateTest.java
index a7d3a303b00..4951a831d1d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/encryption/EncryptedCacheCreateTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/encryption/EncryptedCacheCreateTest.java
@@ -23,6 +23,7 @@ import java.nio.file.Files;
import com.google.common.primitives.Bytes;
import org.apache.ignite.IgniteCache;
import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.DataRegionConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
@@ -56,7 +57,7 @@ public class EncryptedCacheCreateTest extends AbstractEncryptionTest {
startGrid(1);
- igniteEx.cluster().active(true);
+ igniteEx.cluster().state(ClusterState.ACTIVE);
awaitPartitionMapExchange();
}
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/encryption/EncryptedCacheGroupCreateTest.java b/modules/core/src/test/java/org/apache/ignite/internal/encryption/EncryptedCacheGroupCreateTest.java
index 8b8d7ce2d51..94d32f85da1 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/encryption/EncryptedCacheGroupCreateTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/encryption/EncryptedCacheGroupCreateTest.java
@@ -18,6 +18,7 @@
package org.apache.ignite.internal.encryption;
import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.internal.IgniteEx;
import org.apache.ignite.internal.managers.encryption.GridEncryptionManager;
@@ -49,7 +50,7 @@ public class EncryptedCacheGroupCreateTest extends AbstractEncryptionTest {
startGrid(1);
- igniteEx.cluster().active(true);
+ igniteEx.cluster().state(ClusterState.ACTIVE);
awaitPartitionMapExchange();
}
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/encryption/EncryptedCacheNodeJoinTest.java b/modules/core/src/test/java/org/apache/ignite/internal/encryption/EncryptedCacheNodeJoinTest.java
index 072afffa7b9..552af12c791 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/encryption/EncryptedCacheNodeJoinTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/encryption/EncryptedCacheNodeJoinTest.java
@@ -155,7 +155,7 @@ public class EncryptedCacheNodeJoinTest extends AbstractEncryptionTest {
public void testNodeCanJoin() throws Exception {
startGrid(GRID_0);
- startGrid(GRID_3).cluster().active(true);
+ startGrid(GRID_3).cluster().state(ClusterState.ACTIVE);
}
/** */
@@ -164,7 +164,7 @@ public class EncryptedCacheNodeJoinTest extends AbstractEncryptionTest {
IgniteEx grid0 = startGrid(GRID_0);
startGrid(GRID_3);
- grid0.cluster().active(true);
+ grid0.cluster().state(ClusterState.ACTIVE);
stopGrid(GRID_3, false);
@@ -173,7 +173,7 @@ public class EncryptedCacheNodeJoinTest extends AbstractEncryptionTest {
stopGrid(GRID_0, false);
IgniteEx grid3 = startGrid(GRID_3);
- grid3.cluster().active(true);
+ grid3.cluster().state(ClusterState.ACTIVE);
createEncryptedCache(grid3, null, cacheName(), null, false);
@@ -194,7 +194,7 @@ public class EncryptedCacheNodeJoinTest extends AbstractEncryptionTest {
IgniteEx grid3 = startGrid(GRID_3);
- grid3.cluster().active(true);
+ grid3.cluster().state(ClusterState.ACTIVE);
createEncryptedCache(grid0, grid3, cacheName(), null);
@@ -214,7 +214,7 @@ public class EncryptedCacheNodeJoinTest extends AbstractEncryptionTest {
IgniteEx grid3 = startGrid(GRID_3);
- grid3.cluster().active(true);
+ grid3.cluster().state(ClusterState.ACTIVE);
IgniteEx client = startClientGrid(CLIENT);
@@ -325,7 +325,7 @@ public class EncryptedCacheNodeJoinTest extends AbstractEncryptionTest {
IgniteEx grid0 = startGrid(GRID_0);
- grid0.cluster().active(true);
+ grid0.cluster().state(ClusterState.ACTIVE);
assertThrowsWithCause(() -> {
try {
@@ -344,7 +344,7 @@ public class EncryptedCacheNodeJoinTest extends AbstractEncryptionTest {
IgniteEx grid0 = startGrid(GRID_5);
- grid0.cluster().active(true);
+ grid0.cluster().state(ClusterState.ACTIVE);
assertThrowsWithCause(() -> {
try {
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/encryption/EncryptionMXBeanTest.java b/modules/core/src/test/java/org/apache/ignite/internal/encryption/EncryptionMXBeanTest.java
index 4e8ffa0efe1..d092e9f90db 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/encryption/EncryptionMXBeanTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/encryption/EncryptionMXBeanTest.java
@@ -18,6 +18,7 @@
package org.apache.ignite.internal.encryption;
import org.apache.ignite.IgniteException;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.internal.IgniteEx;
import org.apache.ignite.internal.managers.encryption.EncryptionMXBeanImpl;
import org.apache.ignite.internal.util.typedef.internal.CU;
@@ -37,7 +38,7 @@ public class EncryptionMXBeanTest extends AbstractEncryptionTest {
public void testMasterKeyChange() throws Exception {
IgniteEx ignite = startGrid(GRID_0);
- ignite.cluster().active(true);
+ ignite.cluster().state(ClusterState.ACTIVE);
EncryptionMXBean mBean = getMBean(GRID_0);
@@ -57,7 +58,7 @@ public class EncryptionMXBeanTest extends AbstractEncryptionTest {
IgniteEx client = startClientGrid(getConfiguration("client"));
- ignite.cluster().active(true);
+ ignite.cluster().state(ClusterState.ACTIVE);
EncryptionMXBean mBean = getMBean(client.name());
@@ -75,7 +76,7 @@ public class EncryptionMXBeanTest extends AbstractEncryptionTest {
public void testMasterKeyChangeTheSameKeyName() throws Exception {
IgniteEx ignite = startGrid(GRID_0);
- ignite.cluster().active(true);
+ ignite.cluster().state(ClusterState.ACTIVE);
EncryptionMXBean mBean = getMBean(GRID_0);
@@ -95,7 +96,7 @@ public class EncryptionMXBeanTest extends AbstractEncryptionTest {
public void testMasterKeyChangeOnInactiveAndReadonlyCluster() throws Exception {
IgniteEx grid0 = startGrid(GRID_0);
- assertFalse(grid0.cluster().active());
+ assertFalse(grid0.cluster().state().active());
EncryptionMXBean mBean = getMBean(GRID_0);
@@ -117,7 +118,7 @@ public class EncryptionMXBeanTest extends AbstractEncryptionTest {
public void testCacheGroupKeyChange() throws Exception {
IgniteEx ignite = startGrid(GRID_0);
- ignite.cluster().active(true);
+ ignite.cluster().state(ClusterState.ACTIVE);
createEncryptedCache(ignite, null, cacheName(), null);
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/encryption/MasterKeyChangeTest.java b/modules/core/src/test/java/org/apache/ignite/internal/encryption/MasterKeyChangeTest.java
index 91dcd052b05..5df474911e0 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/encryption/MasterKeyChangeTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/encryption/MasterKeyChangeTest.java
@@ -25,6 +25,7 @@ import org.apache.ignite.IgniteCache;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.IgniteException;
import org.apache.ignite.cache.CacheAtomicityMode;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.internal.IgniteEx;
@@ -172,7 +173,7 @@ public class MasterKeyChangeTest extends AbstractEncryptionTest {
IgniteEx client = startClientGrid(getConfiguration("client"));
- srv.cluster().active(true);
+ srv.cluster().state(ClusterState.ACTIVE);
awaitPartitionMapExchange();
@@ -272,7 +273,7 @@ public class MasterKeyChangeTest extends AbstractEncryptionTest {
IgniteEx grid0 = grids.get1();
- grid0.cluster().active(true);
+ grid0.cluster().state(ClusterState.ACTIVE);
CacheConfiguration<Long, String> ccfg = new CacheConfiguration<Long, String>(cacheName())
.setWriteSynchronizationMode(FULL_SYNC)
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/GridIoManagerFileTransmissionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/GridIoManagerFileTransmissionSelfTest.java
index abb5fb749f9..1e2f28d5221 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/GridIoManagerFileTransmissionSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/GridIoManagerFileTransmissionSelfTest.java
@@ -44,6 +44,7 @@ import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.IgniteDataStreamer;
import org.apache.ignite.IgniteException;
import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.DataRegionConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
@@ -176,7 +177,7 @@ public class GridIoManagerFileTransmissionSelfTest extends GridCommonAbstractTes
snd = startGrid(0);
rcv = startGrid(1);
- snd.cluster().active(true);
+ snd.cluster().state(ClusterState.ACTIVE);
addCacheData(snd, DEFAULT_CACHE_NAME);
@@ -793,7 +794,7 @@ public class GridIoManagerFileTransmissionSelfTest extends GridCommonAbstractTes
snd = startGrid(0);
rcv = startGrid(1);
- snd.cluster().active(true);
+ snd.cluster().state(ClusterState.ACTIVE);
File fileToSend = createFileRandomData("testFile", 1024 * 1024);
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/metric/IoStatisticsCacheSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/metric/IoStatisticsCacheSelfTest.java
index cee1e0238bf..9bf48f2cbfe 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/metric/IoStatisticsCacheSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/metric/IoStatisticsCacheSelfTest.java
@@ -25,6 +25,7 @@ import java.util.stream.StreamSupport;
import com.google.common.collect.Sets;
import org.apache.ignite.IgniteCache;
import org.apache.ignite.cache.CacheAtomicityMode;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.DataRegionConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
@@ -140,7 +141,7 @@ public class IoStatisticsCacheSelfTest extends GridCommonAbstractTest {
ignite = (IgniteEx)startGrid();
if (persist())
- ignite.active(true);
+ ignite.cluster().state(ClusterState.ACTIVE);
}
/** {@inheritDoc} */
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/metric/JmxExporterSpiTest.java b/modules/core/src/test/java/org/apache/ignite/internal/metric/JmxExporterSpiTest.java
index 999b3651074..4d447b16870 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/metric/JmxExporterSpiTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/metric/JmxExporterSpiTest.java
@@ -158,7 +158,7 @@ public class JmxExporterSpiTest extends AbstractExporterSpiTest {
ignite = startGrid(0);
- ignite.cluster().active(true);
+ ignite.cluster().state(ClusterState.ACTIVE);
}
/** {@inheritDoc} */
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/metric/MetricsConfigurationTest.java b/modules/core/src/test/java/org/apache/ignite/internal/metric/MetricsConfigurationTest.java
index 353a5e75499..622bea647c3 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/metric/MetricsConfigurationTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/metric/MetricsConfigurationTest.java
@@ -356,7 +356,7 @@ public class MetricsConfigurationTest extends GridCommonAbstractTest {
IgniteEx g1 = startGrid("persistent-1");
try {
- g0.cluster().active(true);
+ g0.cluster().state(ClusterState.ACTIVE);
afterStart.apply(g0, g1);
@@ -366,7 +366,7 @@ public class MetricsConfigurationTest extends GridCommonAbstractTest {
g0 = startGrid("persistent-0");
g1 = startGrid("persistent-1");
- g0.cluster().active(true);
+ g0.cluster().state(ClusterState.ACTIVE);
afterRestart.apply(g0, g1);
}
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/metric/SystemViewSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/metric/SystemViewSelfTest.java
index dcf236716ff..b68fa39369c 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/metric/SystemViewSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/metric/SystemViewSelfTest.java
@@ -1813,7 +1813,7 @@ public class SystemViewSelfTest extends GridCommonAbstractTest {
new DataRegionConfiguration().setName("dr1").setMaxSize(100L * 1024 * 1024)
.setPersistenceEnabled(true)
)))) {
- ignite.cluster().active(true);
+ ignite.cluster().state(ClusterState.ACTIVE);
GridCacheDatabaseSharedManager dbMgr = (GridCacheDatabaseSharedManager)ignite.context().cache().context()
.database();
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/pagemem/wal/record/WALRecordSerializationTest.java b/modules/core/src/test/java/org/apache/ignite/internal/pagemem/wal/record/WALRecordSerializationTest.java
index e83782e457b..b0027611473 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/pagemem/wal/record/WALRecordSerializationTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/pagemem/wal/record/WALRecordSerializationTest.java
@@ -22,6 +22,7 @@ import java.nio.file.Paths;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.DataRegionConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
@@ -94,7 +95,7 @@ public class WALRecordSerializationTest extends GridCommonAbstractTest {
IgniteEx ignite = startGrid(0);
- ignite.cluster().active(true);
+ ignite.cluster().state(ClusterState.ACTIVE);
WALRecord.RecordType[] recordTypes = WALRecord.RecordType.values();
@@ -149,7 +150,7 @@ public class WALRecordSerializationTest extends GridCommonAbstractTest {
IgniteEx ignite = startGrid(0);
- ignite.cluster().active(true);
+ ignite.cluster().state(ClusterState.ACTIVE);
WALRecord.RecordType[] recordTypes = WALRecord.RecordType.values();
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/DeadLockOnNodeLeftExchangeTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/DeadLockOnNodeLeftExchangeTest.java
index 48b0ac2db6e..d3af78f9183 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/DeadLockOnNodeLeftExchangeTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/DeadLockOnNodeLeftExchangeTest.java
@@ -17,6 +17,7 @@
package org.apache.ignite.internal.processors;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.DataRegionConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
@@ -83,7 +84,7 @@ public class DeadLockOnNodeLeftExchangeTest extends GridCommonAbstractTest {
IgniteClusterEx cluster = grid(0).cluster();
cluster.baselineAutoAdjustEnabled(false);
- cluster.active(true);
+ cluster.state(ClusterState.ACTIVE);
TestRecordingCommunicationSpi spi = TestRecordingCommunicationSpi.spi(grid(3));
spi.blockMessages(GridDhtPartitionsSingleMessage.class, getTestIgniteInstanceName(0));
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/authentication/Authentication1kUsersNodeRestartTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/authentication/Authentication1kUsersNodeRestartTest.java
index 28ba469f7a7..b81f81817e1 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/authentication/Authentication1kUsersNodeRestartTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/authentication/Authentication1kUsersNodeRestartTest.java
@@ -19,6 +19,7 @@ package org.apache.ignite.internal.processors.authentication;
import java.util.stream.IntStream;
import org.apache.ignite.IgniteException;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.DataRegionConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
@@ -88,7 +89,7 @@ public class Authentication1kUsersNodeRestartTest extends GridCommonAbstractTest
public void test1kUsersNodeRestartServer() throws Exception {
startGrid(0);
- grid(0).cluster().active(true);
+ grid(0).cluster().state(ClusterState.ACTIVE);
IgniteSecurity sec = grid(0).context().security();
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/authentication/AuthenticationConfigurationClusterTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/authentication/AuthenticationConfigurationClusterTest.java
index 92de58056cc..553e0f8b0f2 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/authentication/AuthenticationConfigurationClusterTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/authentication/AuthenticationConfigurationClusterTest.java
@@ -20,6 +20,7 @@ package org.apache.ignite.internal.processors.authentication;
import java.util.concurrent.Callable;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.IgniteException;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.DataRegionConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
@@ -149,7 +150,7 @@ public class AuthenticationConfigurationClusterTest extends GridCommonAbstractTe
public void testDisabledAuthentication() throws Exception {
startGrid(configuration(0, false, false));
- grid(0).cluster().active(true);
+ grid(0).cluster().state(ClusterState.ACTIVE);
GridTestUtils.assertThrows(log, new Callable<Object>() {
@Override public Object call() throws Exception {
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/authentication/AuthenticationOnNotActiveClusterTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/authentication/AuthenticationOnNotActiveClusterTest.java
index 89f63c3917b..3a3495f65da 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/authentication/AuthenticationOnNotActiveClusterTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/authentication/AuthenticationOnNotActiveClusterTest.java
@@ -17,6 +17,7 @@
package org.apache.ignite.internal.processors.authentication;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.DataRegionConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
@@ -106,7 +107,7 @@ public class AuthenticationOnNotActiveClusterTest extends GridCommonAbstractTest
startClientGrid(CLI_NODE);
startGrid(NODES_COUNT);
- grid(0).cluster().active(true);
+ grid(0).cluster().state(ClusterState.ACTIVE);
SecurityContext secCtxDflt = authenticate(grid(0), User.DFAULT_USER_NAME, "ignite");
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/authentication/AuthenticationProcessorNodeRestartTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/authentication/AuthenticationProcessorNodeRestartTest.java
index 09127189801..d93638641ab 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/authentication/AuthenticationProcessorNodeRestartTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/authentication/AuthenticationProcessorNodeRestartTest.java
@@ -20,6 +20,7 @@ package org.apache.ignite.internal.processors.authentication;
import java.util.Random;
import java.util.concurrent.atomic.AtomicInteger;
import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.DataRegionConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
@@ -92,7 +93,7 @@ public class AuthenticationProcessorNodeRestartTest extends GridCommonAbstractTe
startGrids(NODES_COUNT - 1);
startClientGrid(CLI_NODE);
- grid(0).cluster().active(true);
+ grid(0).cluster().state(ClusterState.ACTIVE);
secCtxDflt = authenticate(grid(0), DFAULT_USER_NAME, "ignite");
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/authentication/AuthenticationProcessorSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/authentication/AuthenticationProcessorSelfTest.java
index 533ac894367..c0199a53165 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/authentication/AuthenticationProcessorSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/authentication/AuthenticationProcessorSelfTest.java
@@ -25,6 +25,7 @@ import java.util.concurrent.Callable;
import java.util.concurrent.atomic.AtomicInteger;
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.DataRegionConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
@@ -113,7 +114,7 @@ public class AuthenticationProcessorSelfTest extends GridCommonAbstractTest {
startGrids(NODES_COUNT - 1);
startClientGrid(CLI_NODE);
- grid(0).cluster().active(true);
+ grid(0).cluster().state(ClusterState.ACTIVE);
secCtxDflt = authenticate(grid(0), DFAULT_USER_NAME, "ignite");
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/BinaryMetadataRegistrationInsideEntryProcessorTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/BinaryMetadataRegistrationInsideEntryProcessorTest.java
index 5eec803a7e3..b4cab4fc835 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/BinaryMetadataRegistrationInsideEntryProcessorTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/BinaryMetadataRegistrationInsideEntryProcessorTest.java
@@ -34,6 +34,7 @@ import org.apache.ignite.cache.CacheEntryProcessor;
import org.apache.ignite.cache.query.ContinuousQuery;
import org.apache.ignite.cache.query.QueryCursor;
import org.apache.ignite.cache.query.ScanQuery;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.internal.IgniteEx;
@@ -107,7 +108,7 @@ public class BinaryMetadataRegistrationInsideEntryProcessorTest extends GridComm
*/
@Test
public void testContinuousQueryAndBinaryObjectBuilder() throws Exception {
- startGrids(3).cluster().active(true);
+ startGrids(3).cluster().state(ClusterState.ACTIVE);
grid(0).createCache(new CacheConfiguration<>()
.setName(CACHE_NAME)
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheDataRegionConfigurationTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheDataRegionConfigurationTest.java
index 5225899e011..5e82fbc436c 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheDataRegionConfigurationTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheDataRegionConfigurationTest.java
@@ -25,6 +25,7 @@ import org.apache.ignite.IgniteLogger;
import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction;
import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.DataPageEvictionMode;
import org.apache.ignite.configuration.DataRegionConfiguration;
@@ -320,7 +321,7 @@ public class CacheDataRegionConfigurationTest extends GridCommonAbstractTest {
startGrid("srv1");
- ignite0.cluster().active(true);
+ ignite0.cluster().state(ClusterState.ACTIVE);
//srv0 and srv1 print warning into the log as the threshold for cache in default cache group is broken
assertTrue(cacheGrpLsnr0.check());
@@ -393,7 +394,7 @@ public class CacheDataRegionConfigurationTest extends GridCommonAbstractTest {
startGrid("srv2");
- ignite0.cluster().active(true);
+ ignite0.cluster().state(ClusterState.ACTIVE);
IgniteEx cl = startGrid("client01");
@@ -450,7 +451,7 @@ public class CacheDataRegionConfigurationTest extends GridCommonAbstractTest {
startGrid("srv1");
- ignite0.cluster().active(true);
+ ignite0.cluster().state(ClusterState.ACTIVE);
ignite0.createCache(
new CacheConfiguration<>(DEFAULT_CACHE_NAME)
@@ -511,7 +512,7 @@ public class CacheDataRegionConfigurationTest extends GridCommonAbstractTest {
IgniteEx ignite0 = startGrid("srv0");
- ignite0.cluster().active(true);
+ ignite0.cluster().state(ClusterState.ACTIVE);
assertFalse(cacheGrpLsnr0.check());
@@ -700,7 +701,7 @@ public class CacheDataRegionConfigurationTest extends GridCommonAbstractTest {
IgniteEx clientNode = startClientGrid(optimize(clientCfg));
- srvNode.cluster().active(true);
+ srvNode.cluster().state(ClusterState.ACTIVE);
assertThrows(log, () -> {
clientNode.getOrCreateCache(
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheGroupMetricsTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheGroupMetricsTest.java
index 4e355e4158d..13ceb7cf994 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheGroupMetricsTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheGroupMetricsTest.java
@@ -373,7 +373,7 @@ public class CacheGroupMetricsTest extends GridCommonAbstractTest implements Ser
IgniteEx ignite = startGrid(0);
- ignite.cluster().active(true);
+ ignite.cluster().state(ClusterState.ACTIVE);
MetricRegistry mxBean0Grp1 = cacheGroupMetrics(0, "group1");
MetricRegistry mxBean0Grp2 = cacheGroupMetrics(0, "group2");
@@ -471,7 +471,7 @@ public class CacheGroupMetricsTest extends GridCommonAbstractTest implements Ser
IgniteEx ignite = startGrid(0);
- ignite.cluster().active(true);
+ ignite.cluster().state(ClusterState.ACTIVE);
MetricRegistry group1Metrics = cacheGroupMetrics(0, "group1");
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheMetricsManageTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheMetricsManageTest.java
index 53de990d014..525ec228324 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheMetricsManageTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheMetricsManageTest.java
@@ -41,6 +41,7 @@ import org.apache.ignite.cache.CacheMetrics;
import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.cache.CacheWriteSynchronizationMode;
import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.DataRegionConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
@@ -410,7 +411,7 @@ public class CacheMetricsManageTest extends GridCommonAbstractTest {
Ignite ig1 = startGrid(1);
Ignite ig2 = startGrid(2);
- ig1.cluster().active(true);
+ ig1.cluster().state(ClusterState.ACTIVE);
CacheConfiguration<Object, Object> ccfg = ig1.cache(CACHE1).getConfiguration(CacheConfiguration.class);
CacheConfiguration<Object, Object> cacheCfg2 = new CacheConfiguration<>(ccfg);
@@ -483,7 +484,7 @@ public class CacheMetricsManageTest extends GridCommonAbstractTest {
ig1 = startGrid(1);
- ig1.cluster().active(true);
+ ig1.cluster().state(ClusterState.ACTIVE);
ig1.getOrCreateCache(cacheCfg2.setStatisticsEnabled(false));
@@ -575,7 +576,7 @@ public class CacheMetricsManageTest extends GridCommonAbstractTest {
CountDownLatch txLatch0 = new CountDownLatch(contCnt * 2);
- ig.cluster().active(true);
+ ig.cluster().state(ClusterState.ACTIVE);
client = true;
@@ -709,7 +710,7 @@ public class CacheMetricsManageTest extends GridCommonAbstractTest {
CountDownLatch txLatch = new CountDownLatch(contCnt);
- ig.cluster().active(true);
+ ig.cluster().state(ClusterState.ACTIVE);
client = true;
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheValidatorMetricsTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheValidatorMetricsTest.java
index efbab86075a..470771b559b 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheValidatorMetricsTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheValidatorMetricsTest.java
@@ -25,6 +25,7 @@ import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.cache.PartitionLossPolicy;
import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.configuration.TopologyValidator;
@@ -100,7 +101,7 @@ public class CacheValidatorMetricsTest extends GridCommonAbstractTest implements
@Test
public void testCacheValidatorMetrics() throws Exception {
final IgniteEx crd = startGrid(1);
- crd.cluster().active(true);
+ crd.cluster().state(ClusterState.ACTIVE);
crd.cluster().baselineAutoAdjustEnabled(false);
assertCacheStatus(CACHE_NAME_1, true, true);
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheWithDifferentDataRegionConfigurationTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheWithDifferentDataRegionConfigurationTest.java
index e85d94cd2a3..f52a991a442 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheWithDifferentDataRegionConfigurationTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheWithDifferentDataRegionConfigurationTest.java
@@ -22,6 +22,7 @@ import java.util.List;
import java.util.concurrent.Callable;
import org.apache.ignite.IgniteCache;
import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.DataRegionConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
@@ -125,7 +126,7 @@ public class CacheWithDifferentDataRegionConfigurationTest extends GridCommonAbs
.andCache(CACHE_2)
.start();
- node1.cluster().active(true);
+ node1.cluster().state(ClusterState.ACTIVE);
populateCache(node1, CACHE_1, 1000);
populateCache(node2, CACHE_2, 350);
@@ -148,7 +149,7 @@ public class CacheWithDifferentDataRegionConfigurationTest extends GridCommonAbs
.andCache(CACHE_2)
.start();
- node1.cluster().active(true);
+ node1.cluster().state(ClusterState.ACTIVE);
populateCache(node1, CACHE_1, 1000);
populateCache(node2, CACHE_2, 350);
@@ -198,7 +199,7 @@ public class CacheWithDifferentDataRegionConfigurationTest extends GridCommonAbs
.andExclusiveCache(CACHE_2, REGION_4)
.start();
- node1.cluster().active(true);
+ node1.cluster().state(ClusterState.ACTIVE);
populateCache(node1, CACHE_1, 1000);
populateCache(node2, CACHE_2, 350);
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/ClusterStateTestUtils.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/ClusterStateTestUtils.java
index 738b33906f8..02d4fce80e7 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/ClusterStateTestUtils.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/ClusterStateTestUtils.java
@@ -91,7 +91,7 @@ public class ClusterStateTestUtils {
"Can not perform the operation because the cluster is inactive. " +
"Note, that the cluster is considered inactive by default " +
"if Ignite Persistent Store is used to let all the nodes join the cluster. " +
- "To activate the cluster call Ignite.active(true)."
+ "To activate the cluster call Ignite.cluster().state(ClusterState.ACTIVE)."
));
break;
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicCacheStartFailWithPersistenceTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicCacheStartFailWithPersistenceTest.java
index 8643b66a19b..c41a3de4076 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicCacheStartFailWithPersistenceTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicCacheStartFailWithPersistenceTest.java
@@ -19,6 +19,7 @@ package org.apache.ignite.internal.processors.cache;
import org.apache.ignite.IgniteCache;
import org.apache.ignite.IgniteDataStreamer;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.DataRegionConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
@@ -61,7 +62,7 @@ public class IgniteDynamicCacheStartFailWithPersistenceTest extends IgniteAbstra
startGrids(gridCount());
- grid(0).cluster().active(true);
+ grid(0).cluster().state(ClusterState.ACTIVE);
awaitPartitionMapExchange();
}
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteMarshallerCacheFSRestoreTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteMarshallerCacheFSRestoreTest.java
index c523792b854..ff7db00e47d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteMarshallerCacheFSRestoreTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteMarshallerCacheFSRestoreTest.java
@@ -30,6 +30,7 @@ import org.apache.ignite.binary.BinaryObject;
import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
@@ -199,7 +200,7 @@ public class IgniteMarshallerCacheFSRestoreTest extends GridCommonAbstractTest {
Ignite ig = startGrids(3);
- ig.active(true);
+ ig.cluster().state(ClusterState.ACTIVE);
ig.cache(DEFAULT_CACHE_NAME).put(0, new SimpleValue(0, "value0"));
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/NonAffinityCoordinatorDynamicStartStopTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/NonAffinityCoordinatorDynamicStartStopTest.java
index 0110aae3ec9..064f8f921bc 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/NonAffinityCoordinatorDynamicStartStopTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/NonAffinityCoordinatorDynamicStartStopTest.java
@@ -21,6 +21,7 @@ import org.apache.ignite.IgniteCache;
import org.apache.ignite.cache.CacheWriteSynchronizationMode;
import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction;
import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.DataRegionConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
@@ -74,7 +75,7 @@ public class NonAffinityCoordinatorDynamicStartStopTest extends GridCommonAbstra
final Ignite crd = startGrid(DUMMY_GRID_NAME);
- crd.active(true);
+ crd.cluster().state(ClusterState.ACTIVE);
startClientGrid("client");
}
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/PartitionsExchangeCoordinatorFailoverTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/PartitionsExchangeCoordinatorFailoverTest.java
index e7fc015b271..7e27386d692 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/PartitionsExchangeCoordinatorFailoverTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/PartitionsExchangeCoordinatorFailoverTest.java
@@ -28,6 +28,7 @@ import org.apache.ignite.IgniteException;
import org.apache.ignite.IgniteSystemProperties;
import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction;
import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.internal.IgniteEx;
@@ -121,7 +122,7 @@ public class PartitionsExchangeCoordinatorFailoverTest extends GridCommonAbstrac
IgniteEx newCrd = startGrid(1);
- crd.cluster().active(true);
+ crd.cluster().state(ClusterState.ACTIVE);
// 3 node join topology version.
AffinityTopologyVersion joinThirdNodeVer = new AffinityTopologyVersion(3, 0);
@@ -211,7 +212,7 @@ public class PartitionsExchangeCoordinatorFailoverTest extends GridCommonAbstrac
IgniteEx problemNode = startGrid(2);
- crd.cluster().active(true);
+ crd.cluster().state(ClusterState.ACTIVE);
awaitPartitionMapExchange();
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/RebalanceWithDifferentThreadPoolSizeTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/RebalanceWithDifferentThreadPoolSizeTest.java
index 623af7d23f3..823e05bd529 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/RebalanceWithDifferentThreadPoolSizeTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/RebalanceWithDifferentThreadPoolSizeTest.java
@@ -20,6 +20,7 @@ package org.apache.ignite.internal.processors.cache;
import org.apache.ignite.IgniteCache;
import org.apache.ignite.cache.CacheRebalanceMode;
import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.internal.IgniteEx;
@@ -73,7 +74,7 @@ public class RebalanceWithDifferentThreadPoolSizeTest extends GridCommonAbstract
IgniteEx ex = startGrid(0);
- ex.cluster().active(true);
+ ex.cluster().state(ClusterState.ACTIVE);
IgniteCache<Integer, Integer> cache = ex.cache(CACHE_NAME);
for (int i = 0; i < ENTRIES_COUNT; i++)
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/WalModeChangeAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/WalModeChangeAbstractSelfTest.java
index b6242b3d836..8d74ee05ae8 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/WalModeChangeAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/WalModeChangeAbstractSelfTest.java
@@ -23,6 +23,7 @@ import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.IgniteException;
import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.CacheMode;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.internal.IgniteEx;
import org.apache.ignite.internal.util.lang.IgniteInClosureX;
@@ -63,7 +64,7 @@ public abstract class WalModeChangeAbstractSelfTest extends WalModeChangeCommonA
Ignite cli = startGrid(config(CLI, true, false));
- cli.cluster().active(true);
+ cli.cluster().state(ClusterState.ACTIVE);
}
/**
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/BinaryMetadataMoveLegacyFolderTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/BinaryMetadataMoveLegacyFolderTest.java
index 41c858a3e0e..538b3c681d1 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/BinaryMetadataMoveLegacyFolderTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/BinaryMetadataMoveLegacyFolderTest.java
@@ -25,6 +25,7 @@ import org.apache.ignite.IgniteCache;
import org.apache.ignite.binary.BinaryObject;
import org.apache.ignite.binary.BinaryObjectBuilder;
import org.apache.ignite.binary.BinaryType;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.DataRegionConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
@@ -81,7 +82,7 @@ public class BinaryMetadataMoveLegacyFolderTest extends GridCommonAbstractTest {
/** {@inheritDoc} */
@Override protected IgniteEx startGrid(IgniteConfiguration cfg) throws Exception {
IgniteEx grid = super.startGrid(cfg);
- grid.active(true);
+ grid.cluster().state(ClusterState.ACTIVE);
return grid;
}
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/BinaryMetadataRemoveWithPersistenceTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/BinaryMetadataRemoveWithPersistenceTest.java
index 9133b1e835a..842c5c5fe01 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/BinaryMetadataRemoveWithPersistenceTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/BinaryMetadataRemoveWithPersistenceTest.java
@@ -18,6 +18,7 @@
package org.apache.ignite.internal.processors.cache.binary;
import org.apache.ignite.binary.BinaryObjectBuilder;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.DataRegionConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
@@ -46,7 +47,7 @@ public class BinaryMetadataRemoveWithPersistenceTest extends BinaryMetadataRemov
@Override protected void startCluster() throws Exception {
super.startCluster();
- grid("srv0").cluster().active(true);
+ grid("srv0").cluster().state(ClusterState.ACTIVE);
}
/**
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteSequenceInternalCleanupTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteSequenceInternalCleanupTest.java
index fceceffed99..9fa58f363c3 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteSequenceInternalCleanupTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteSequenceInternalCleanupTest.java
@@ -22,6 +22,7 @@ import java.util.List;
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteAtomicSequence;
import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.AtomicConfiguration;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
@@ -109,9 +110,9 @@ public class IgniteSequenceInternalCleanupTest extends GridCommonAbstractTest {
assertEquals(1, puts);
- grid(GRIDS_CNT - 1).cluster().active(false);
+ grid(GRIDS_CNT - 1).cluster().state(ClusterState.INACTIVE);
- ignite.cluster().active(true);
+ ignite.cluster().state(ClusterState.ACTIVE);
long putsAfter = ignite.cache("test0").metrics().getCachePuts();
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/OutOfMemoryVolatileRegionTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/OutOfMemoryVolatileRegionTest.java
index bce9c878f2d..1704281429c 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/OutOfMemoryVolatileRegionTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/OutOfMemoryVolatileRegionTest.java
@@ -21,6 +21,7 @@ import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCache;
import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.DataRegionConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
@@ -133,7 +134,7 @@ public class OutOfMemoryVolatileRegionTest extends GridCommonAbstractTest {
* @param attempts Number of attempts to load and clear the cache.
*/
private void loadAndClearCache(CacheAtomicityMode mode, int attempts) {
- grid(0).cluster().active(true);
+ grid(0).cluster().state(ClusterState.ACTIVE);
failure = false;
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/Cache64kPartitionsTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/Cache64kPartitionsTest.java
index 1c4b9689f87..40aa819a17d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/Cache64kPartitionsTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/Cache64kPartitionsTest.java
@@ -18,6 +18,7 @@
package org.apache.ignite.internal.processors.cache.distributed;
import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.DataRegionConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
@@ -85,7 +86,7 @@ public class Cache64kPartitionsTest extends GridCommonAbstractTest {
try {
startGrids(4);
- grid(0).active(true);
+ grid(0).cluster().state(ClusterState.ACTIVE);
}
finally {
stopAllGrids();
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheBaselineTopologyTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheBaselineTopologyTest.java
index 89bce1439ac..7ef2e4cbe7a 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheBaselineTopologyTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheBaselineTopologyTest.java
@@ -154,7 +154,7 @@ public class CacheBaselineTopologyTest extends GridCommonAbstractTest {
IgniteEx ignite = startGrid(2);
ignite.cluster().baselineAutoAdjustEnabled(false);
- ignite.cluster().active(true);
+ ignite.cluster().state(ClusterState.ACTIVE);
awaitPartitionMapExchange();
@@ -229,7 +229,7 @@ public class CacheBaselineTopologyTest extends GridCommonAbstractTest {
IgniteEx ignite = grid(0);
ignite.cluster().baselineAutoAdjustEnabled(false);
- ignite.cluster().active(true);
+ ignite.cluster().state(ClusterState.ACTIVE);
awaitPartitionMapExchange();
@@ -382,9 +382,9 @@ public class CacheBaselineTopologyTest extends GridCommonAbstractTest {
IgniteEx ig = grid(0);
ig.cluster().baselineAutoAdjustEnabled(false);
- ig.cluster().active(true);
+ ig.cluster().state(ClusterState.ACTIVE);
- assertTrue(ig.cluster().active());
+ assertTrue(ig.cluster().state().active());
startGrid(NODE_COUNT);
@@ -399,9 +399,9 @@ public class CacheBaselineTopologyTest extends GridCommonAbstractTest {
});
while (!fut.isDone()) {
- assertTrue(grid(0).cluster().active());
+ assertTrue(grid(0).cluster().state().active());
assertTrue(grid(0).context().state().publicApiActiveState(false));
- assertTrue(grid(NODE_COUNT).cluster().active());
+ assertTrue(grid(NODE_COUNT).cluster().state().active());
assertTrue(grid(NODE_COUNT).context().state().publicApiActiveState(false));
}
@@ -424,7 +424,7 @@ public class CacheBaselineTopologyTest extends GridCommonAbstractTest {
ignite = grid(0);
ignite.cluster().baselineAutoAdjustEnabled(false);
- ignite.cluster().active(true);
+ ignite.cluster().state(ClusterState.ACTIVE);
awaitPartitionMapExchange();
@@ -542,7 +542,7 @@ public class CacheBaselineTopologyTest extends GridCommonAbstractTest {
IgniteEx ig = grid(0);
- ig.cluster().active(true);
+ ig.cluster().state(ClusterState.ACTIVE);
awaitPartitionMapExchange();
@@ -630,7 +630,7 @@ public class CacheBaselineTopologyTest extends GridCommonAbstractTest {
IgniteEx ig = grid(0);
- ig.cluster().active(true);
+ ig.cluster().state(ClusterState.ACTIVE);
IgniteCache<Integer, Integer> cache =
ig.createCache(
@@ -706,7 +706,7 @@ public class CacheBaselineTopologyTest extends GridCommonAbstractTest {
boolean activated = GridTestUtils.waitForCondition(() -> {
for (int i = 0; i < NODE_COUNT; i++) {
- if (!grid(i).cluster().active())
+ if (!grid(i).cluster().state().active())
return false;
}
@@ -742,7 +742,7 @@ public class CacheBaselineTopologyTest extends GridCommonAbstractTest {
Ignite ignite3 = grid(3);
- ignite3.cluster().active(true);
+ ignite3.cluster().state(ClusterState.ACTIVE);
CacheConfiguration<Object, Object> repCacheCfg = new CacheConfiguration<>("replicated")
.setCacheMode(CacheMode.REPLICATED)
@@ -762,7 +762,7 @@ public class CacheBaselineTopologyTest extends GridCommonAbstractTest {
startGrids(5);
- GridTestUtils.waitForCondition(() -> grid(0).cluster().active(), getTestTimeout());
+ GridTestUtils.waitForCondition(() -> grid(0).cluster().state().active(), getTestTimeout());
for (int g = 0; g < 5; g++) {
for (int i = 0; i < 100; i++)
@@ -779,7 +779,7 @@ public class CacheBaselineTopologyTest extends GridCommonAbstractTest {
Ignite ignite3 = grid(3);
- ignite3.cluster().active(true);
+ ignite3.cluster().state(ClusterState.ACTIVE);
stopGrid(0);
@@ -802,7 +802,7 @@ public class CacheBaselineTopologyTest extends GridCommonAbstractTest {
startGrid(3);
startGrid(4);
- GridTestUtils.waitForCondition(() -> grid(0).cluster().active(), getTestTimeout());
+ GridTestUtils.waitForCondition(() -> grid(0).cluster().state().active(), getTestTimeout());
for (int g = 0; g < 5; g++) {
for (int i = 0; i < 2048; i++)
@@ -817,7 +817,7 @@ public class CacheBaselineTopologyTest extends GridCommonAbstractTest {
public void testNonPersistentCachesDontIgnoreBaselineTopology() throws Exception {
Ignite ig = startGrids(4);
- ig.cluster().active(true);
+ ig.cluster().state(ClusterState.ACTIVE);
IgniteCache persistentCache = ig.createCache(CACHE_NAME);
@@ -930,7 +930,7 @@ public class CacheBaselineTopologyTest extends GridCommonAbstractTest {
IgniteEx ig = grid(0);
- ig.cluster().active(true);
+ ig.cluster().state(ClusterState.ACTIVE);
IgniteCache<Integer, Integer> cache = ig.createCache(
new CacheConfiguration<Integer, Integer>()
@@ -963,7 +963,7 @@ public class CacheBaselineTopologyTest extends GridCommonAbstractTest {
ig = grid(0);
- ig.cluster().active(true);
+ ig.cluster().state(ClusterState.ACTIVE);
cache = ig.cache(cacheName);
@@ -1001,7 +1001,7 @@ public class CacheBaselineTopologyTest extends GridCommonAbstractTest {
public void testSettingBaselineTopologyWithOfflineNode() throws Exception {
Ignite ignite = startGrids(2);
- ignite.cluster().active(true);
+ ignite.cluster().state(ClusterState.ACTIVE);
ignite(0).createCache(defaultCacheConfiguration().setNodeFilter(
(IgnitePredicate<ClusterNode>)node -> node.attribute("some-attr") != null));
@@ -1030,7 +1030,7 @@ public class CacheBaselineTopologyTest extends GridCommonAbstractTest {
ignite.cluster().baselineAutoAdjustEnabled(false);
- ignite.cluster().active(true);
+ ignite.cluster().state(ClusterState.ACTIVE);
stopGrid(1);
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheBlockOnReadAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheBlockOnReadAbstractTest.java
index 23fc90ceb6c..c4f5d3bf081 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheBlockOnReadAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheBlockOnReadAbstractTest.java
@@ -46,6 +46,7 @@ import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction;
import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.DataRegionConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
@@ -315,7 +316,7 @@ public abstract class CacheBlockOnReadAbstractTest extends GridCommonAbstractTes
baseline.add(startGrid(idx++));
// Activate cluster.
- baseline.get(0).cluster().active(true);
+ baseline.get(0).cluster().state(ClusterState.ACTIVE);
// Start server nodes in activated cluster.
for (int i = 0; i < serversCount(); i++)
@@ -343,7 +344,7 @@ public abstract class CacheBlockOnReadAbstractTest extends GridCommonAbstractTes
clients.clear();
- grid(0).cluster().active(false);
+ grid(0).cluster().state(ClusterState.INACTIVE);
stopAllGrids();
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheDataLossOnPartitionMoveTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheDataLossOnPartitionMoveTest.java
index cd4de7ef0a6..892506f613b 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheDataLossOnPartitionMoveTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheDataLossOnPartitionMoveTest.java
@@ -29,6 +29,7 @@ import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.cache.affinity.AffinityFunctionContext;
import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction;
import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.DataRegionConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
@@ -135,7 +136,7 @@ public class CacheDataLossOnPartitionMoveTest extends GridCommonAbstractTest {
Ignite ignite = startGridsMultiThreaded(GRIDS_CNT / 2, false);
ignite.cluster().baselineAutoAdjustEnabled(false);
- ignite.cluster().active(true);
+ ignite.cluster().state(ClusterState.ACTIVE);
List<Integer> toCp = movingKeysAfterJoin(ignite, DEFAULT_CACHE_NAME, 1,
node -> ((GridTestNode)node).setAttribute(GRP_ATTR, ODD_GRP), null);
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CachePageWriteLockUnlockTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CachePageWriteLockUnlockTest.java
index 29c3deee1b1..52b39a4b2ed 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CachePageWriteLockUnlockTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CachePageWriteLockUnlockTest.java
@@ -23,6 +23,7 @@ import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.DataRegionConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
@@ -80,7 +81,7 @@ public class CachePageWriteLockUnlockTest extends GridCommonAbstractTest {
try {
IgniteEx grid0 = startGrid(0);
- grid0.cluster().active(true);
+ grid0.cluster().state(ClusterState.ACTIVE);
int total = 512;
@@ -94,7 +95,7 @@ public class CachePageWriteLockUnlockTest extends GridCommonAbstractTest {
grid0 = startGrid(0);
- grid0.cluster().active(true);
+ grid0.cluster().state(ClusterState.ACTIVE);
putData(grid0, total, PARTITION); // Will use pages from reuse pool.
@@ -104,7 +105,7 @@ public class CachePageWriteLockUnlockTest extends GridCommonAbstractTest {
grid0 = startGrid(0);
- grid0.cluster().active(true);
+ grid0.cluster().state(ClusterState.ACTIVE);
preloadPartition(grid0, DEFAULT_CACHE_NAME, PARTITION);
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheParallelStartTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheParallelStartTest.java
index a542aad46ba..3554be2a2d3 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheParallelStartTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheParallelStartTest.java
@@ -20,6 +20,7 @@ package org.apache.ignite.internal.processors.cache.distributed;
import java.util.ArrayList;
import java.util.Collection;
import org.apache.ignite.IgniteSystemProperties;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.DataRegionConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
@@ -148,13 +149,13 @@ public class CacheParallelStartTest extends GridCommonAbstractTest {
IgniteEx igniteEx2 = startGrid(1);
- igniteEx.cluster().active(true);
+ igniteEx.cluster().state(ClusterState.ACTIVE);
assertCaches(igniteEx);
assertCaches(igniteEx2);
- igniteEx.cluster().active(false);
+ igniteEx.cluster().state(ClusterState.INACTIVE);
assertCachesAfterStop(igniteEx);
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CachePartitionLossWithPersistenceTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CachePartitionLossWithPersistenceTest.java
index c154b744d6b..6209c057b6a 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CachePartitionLossWithPersistenceTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CachePartitionLossWithPersistenceTest.java
@@ -29,6 +29,7 @@ import org.apache.ignite.cache.CacheWriteSynchronizationMode;
import org.apache.ignite.cache.PartitionLossPolicy;
import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction;
import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.DataRegionConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
@@ -121,12 +122,12 @@ public class CachePartitionLossWithPersistenceTest extends GridCommonAbstractTes
@Test
public void testResetOnLesserTopologyAfterRestart() throws Exception {
IgniteEx crd = startGrids(5);
- crd.cluster().active(true);
+ crd.cluster().state(ClusterState.ACTIVE);
stopAllGrids();
crd = startGrids(2);
- crd.cluster().active(true);
+ crd.cluster().state(ClusterState.ACTIVE);
resetBaselineTopology();
@@ -181,7 +182,7 @@ public class CachePartitionLossWithPersistenceTest extends GridCommonAbstractTes
lossPlc = READ_WRITE_SAFE;
IgniteEx crd = startGrids(2);
- crd.cluster().active(true);
+ crd.cluster().state(ClusterState.ACTIVE);
startGrid(2);
resetBaselineTopology();
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CachePartitionLossWithRestartsTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CachePartitionLossWithRestartsTest.java
index e8bfdcc0894..457370f7e78 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CachePartitionLossWithRestartsTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CachePartitionLossWithRestartsTest.java
@@ -24,6 +24,7 @@ import java.util.List;
import java.util.Set;
import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.DataRegionConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
@@ -176,7 +177,7 @@ public class CachePartitionLossWithRestartsTest extends GridCommonAbstractTest {
public void testPartitionLossDetectionOnClientTopology() throws Exception {
final IgniteEx crd = startGrids(3);
crd.cluster().baselineAutoAdjustEnabled(false);
- crd.cluster().active(true);
+ crd.cluster().state(ClusterState.ACTIVE);
assertTrue(grid(1).cache(DEFAULT_CACHE_NAME).lostPartitions().isEmpty());
assertTrue(grid(2).cache(DEFAULT_CACHE_NAME).lostPartitions().isEmpty());
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CachePartitionLostAfterSupplierHasLeftTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CachePartitionLostAfterSupplierHasLeftTest.java
index ad8005a092b..f823d9f9851 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CachePartitionLostAfterSupplierHasLeftTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CachePartitionLostAfterSupplierHasLeftTest.java
@@ -27,6 +27,7 @@ import org.apache.ignite.IgniteDataStreamer;
import org.apache.ignite.cache.PartitionLossPolicy;
import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction;
import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.DataRegionConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
@@ -240,7 +241,7 @@ public class CachePartitionLostAfterSupplierHasLeftTest extends GridCommonAbstra
IgniteEx crd = (IgniteEx)startGridsMultiThreaded(2);
- crd.cluster().active(true);
+ crd.cluster().state(ClusterState.ACTIVE);
IgniteCache<Integer, String> cache0 = crd.cache(DEFAULT_CACHE_NAME);
@@ -313,7 +314,7 @@ public class CachePartitionLostAfterSupplierHasLeftTest extends GridCommonAbstra
private void doTestPartitionLostWhileClearing(int cnt, int mode) throws Exception {
IgniteEx crd = startGrids(cnt);
crd.cluster().baselineAutoAdjustEnabled(false);
- crd.cluster().active(true);
+ crd.cluster().state(ClusterState.ACTIVE);
int partId = -1;
int idx0 = 0;
@@ -385,11 +386,11 @@ public class CachePartitionLostAfterSupplierHasLeftTest extends GridCommonAbstra
if (mode == 1) {
crd = startGrids(cnt);
- crd.cluster().active(true);
+ crd.cluster().state(ClusterState.ACTIVE);
}
else if (mode == 2) {
crd = startGrid(idx1);
- crd.cluster().active(true);
+ crd.cluster().state(ClusterState.ACTIVE);
startGrid(idx0);
}
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheRentingStateRepairTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheRentingStateRepairTest.java
index d87bbd9401e..f6b5c5fd98e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheRentingStateRepairTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheRentingStateRepairTest.java
@@ -22,6 +22,7 @@ import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.DataRegionConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
@@ -114,7 +115,7 @@ public class CacheRentingStateRepairTest extends GridCommonAbstractTest {
g0.cluster().baselineAutoAdjustEnabled(false);
startGrid(1);
- g0.cluster().active(true);
+ g0.cluster().state(ClusterState.ACTIVE);
awaitPartitionMapExchange();
@@ -246,7 +247,7 @@ public class CacheRentingStateRepairTest extends GridCommonAbstractTest {
IgniteEx g0 = startGrids(2);
g0.cluster().baselineAutoAdjustEnabled(false);
- g0.cluster().active(true);
+ g0.cluster().state(ClusterState.ACTIVE);
awaitPartitionMapExchange();
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheResultIsNotNullOnPartitionLossTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheResultIsNotNullOnPartitionLossTest.java
index 8872465e627..910feda8a8b 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheResultIsNotNullOnPartitionLossTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheResultIsNotNullOnPartitionLossTest.java
@@ -32,6 +32,7 @@ import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.cache.CacheWriteSynchronizationMode;
import org.apache.ignite.cache.PartitionLossPolicy;
import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.events.EventType;
@@ -93,7 +94,7 @@ public class CacheResultIsNotNullOnPartitionLossTest extends GridCommonAbstractT
for (Integer i : list)
startGrid(i);
- grid(0).cluster().active(true);
+ grid(0).cluster().state(ClusterState.ACTIVE);
grid(0).cluster().baselineAutoAdjustEnabled(false);
client = startClientGrid(CLIENT_IDX);
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/FailBackupOnAtomicOperationTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/FailBackupOnAtomicOperationTest.java
index 934b0ae3420..8f7c47b1ec6 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/FailBackupOnAtomicOperationTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/FailBackupOnAtomicOperationTest.java
@@ -23,6 +23,7 @@ import org.apache.ignite.IgniteCache;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.CacheWriteSynchronizationMode;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.DataRegionConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
@@ -91,7 +92,7 @@ public class FailBackupOnAtomicOperationTest extends GridCommonAbstractTest {
public void nodeFailOnCacheOp() throws Exception {
Ignite ignite0 = startGrids(3);
- ignite0.cluster().active(true);
+ ignite0.cluster().state(ClusterState.ACTIVE);
Ignite igniteClient = startClientGrid("client");
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionNotLoadedEventSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionNotLoadedEventSelfTest.java
index 3a7a3faac00..2178c953651 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionNotLoadedEventSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionNotLoadedEventSelfTest.java
@@ -24,6 +24,7 @@ import java.util.concurrent.TimeUnit;
import org.apache.ignite.IgniteCache;
import org.apache.ignite.cache.affinity.Affinity;
import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.events.CacheRebalancingEvent;
@@ -108,7 +109,7 @@ public class GridCachePartitionNotLoadedEventSelfTest extends GridCommonAbstract
IgniteEx crd = (IgniteEx)startGridsMultiThreaded(4);
crd.cluster().baselineAutoAdjustEnabled(false);
- crd.cluster().active(true);
+ crd.cluster().state(ClusterState.ACTIVE);
awaitPartitionMapExchange();
@@ -176,7 +177,7 @@ public class GridCachePartitionNotLoadedEventSelfTest extends GridCommonAbstract
startGrid(1);
crd.cluster().baselineAutoAdjustEnabled(false);
- crd.cluster().active(true);
+ crd.cluster().state(ClusterState.ACTIVE);
final PartitionNotFullyLoadedListener lsnr = new PartitionNotFullyLoadedListener();
@@ -211,7 +212,7 @@ public class GridCachePartitionNotLoadedEventSelfTest extends GridCommonAbstract
IgniteEx crd = startGrid(1);
crd.cluster().baselineAutoAdjustEnabled(false);
- crd.cluster().active(true);
+ crd.cluster().state(ClusterState.ACTIVE);
startGrid(0);
@@ -251,7 +252,7 @@ public class GridCachePartitionNotLoadedEventSelfTest extends GridCommonAbstract
startGrid(1);
crd.cluster().baselineAutoAdjustEnabled(false);
- crd.cluster().active(true);
+ crd.cluster().state(ClusterState.ACTIVE);
final PartitionNotFullyLoadedListener lsnr = new PartitionNotFullyLoadedListener();
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridExchangeFreeSwitchTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridExchangeFreeSwitchTest.java
index 5eb6a606bf4..dedd7b402b7 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridExchangeFreeSwitchTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridExchangeFreeSwitchTest.java
@@ -677,7 +677,7 @@ public class GridExchangeFreeSwitchTest extends GridCommonAbstractTest {
startGrid(0); // Primary partition holder.
startGrid(1); // Backup partition holder.
- grid(0).cluster().active(true);
+ grid(0).cluster().state(ClusterState.ACTIVE);
grid(1).close(); // Stopping backup partition holder.
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCachePartitionLossPolicySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCachePartitionLossPolicySelfTest.java
index 1fdfa13ba34..a6eaa77b8ad 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCachePartitionLossPolicySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCachePartitionLossPolicySelfTest.java
@@ -39,6 +39,7 @@ import org.apache.ignite.cache.affinity.Affinity;
import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction;
import org.apache.ignite.cache.query.ScanQuery;
import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.DataRegionConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
@@ -482,7 +483,7 @@ public class IgniteCachePartitionLossPolicySelfTest extends GridCommonAbstractTe
private Set<Integer> prepareTopology(int nodes, boolean autoAdjust, P1<Event> lsnr, int... stopNodes) throws Exception {
final IgniteEx crd = startGrids(nodes);
crd.cluster().baselineAutoAdjustEnabled(autoAdjust);
- crd.cluster().active(true);
+ crd.cluster().state(ClusterState.ACTIVE);
Affinity<Object> aff = ignite(0).affinity(CACHES[0]);
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/CacheGetReadFromBackupFailoverTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/CacheGetReadFromBackupFailoverTest.java
index c16675e084d..8424d9c905f 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/CacheGetReadFromBackupFailoverTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/CacheGetReadFromBackupFailoverTest.java
@@ -28,6 +28,7 @@ import javax.cache.CacheException;
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteDataStreamer;
import org.apache.ignite.IgniteIllegalStateException;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.failure.AbstractFailureHandler;
@@ -140,7 +141,7 @@ public class CacheGetReadFromBackupFailoverTest extends GridCommonAbstractTest {
public void testFailover() throws Exception {
Ignite ignite = ignite(0);
- ignite.cluster().active(true);
+ ignite.cluster().state(ClusterState.ACTIVE);
ThreadLocalRandom rnd = ThreadLocalRandom.current();
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GracefulShutdownTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GracefulShutdownTest.java
index b4ca9dac214..688aced8ca3 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GracefulShutdownTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GracefulShutdownTest.java
@@ -22,6 +22,7 @@ import org.apache.ignite.IgniteCache;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.IgniteDataStreamer;
import org.apache.ignite.ShutdownPolicy;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.internal.IgniteEx;
@@ -98,7 +99,7 @@ public class GracefulShutdownTest extends GridCacheDhtPreloadWaitForBackupsWithP
public void testTwoNodesWithDifferentConfuguration() throws Exception {
Ignite ignite0 = startGrid(0);
- ignite0.cluster().active(true);
+ ignite0.cluster().state(ClusterState.ACTIVE);
assertSame(ignite0.configuration().getShutdownPolicy(), ShutdownPolicy.GRACEFUL);
@@ -117,7 +118,7 @@ public class GracefulShutdownTest extends GridCacheDhtPreloadWaitForBackupsWithP
public void testRestartWithDynamicConfiguredPolicy() throws Exception {
Ignite ignite0 = startGrid(0);
- ignite0.cluster().active(true);
+ ignite0.cluster().state(ClusterState.ACTIVE);
assertSame(ignite0.cluster().shutdownPolicy(), ignite0.configuration().getShutdownPolicy());
@@ -160,7 +161,7 @@ public class GracefulShutdownTest extends GridCacheDhtPreloadWaitForBackupsWithP
Ignite ignite0 = startGrid(0);
- ignite0.cluster().active(true);
+ ignite0.cluster().state(ClusterState.ACTIVE);
for (int i = 1; i <= 3; i++) {
IgniteCache cache = ignite0.cache("cache" + i);
@@ -230,7 +231,7 @@ public class GracefulShutdownTest extends GridCacheDhtPreloadWaitForBackupsWithP
Ignite ignite0 = startGrid(0);
- ignite0.cluster().active(true);
+ ignite0.cluster().state(ClusterState.ACTIVE);
for (int i = 1; i <= 3; i++) {
IgniteCache cache = ignite0.cache("cache" + i);
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadDelayedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadDelayedSelfTest.java
index 8f952e2d808..c4320ece755 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadDelayedSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadDelayedSelfTest.java
@@ -30,6 +30,7 @@ import org.apache.ignite.cache.CacheWriteSynchronizationMode;
import org.apache.ignite.cache.affinity.Affinity;
import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction;
import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.DataRegionConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
@@ -138,7 +139,7 @@ public class GridCacheDhtPreloadDelayedSelfTest extends GridCommonAbstractTest {
Ignite g0 = startGrid(0);
if (persistenceEnabled())
- g0.cluster().active(true);
+ g0.cluster().state(ClusterState.ACTIVE);
int cnt = KEY_CNT;
@@ -228,7 +229,7 @@ public class GridCacheDhtPreloadDelayedSelfTest extends GridCommonAbstractTest {
Ignite g0 = startGrid(0);
if (persistenceEnabled())
- g0.cluster().active(true);
+ g0.cluster().state(ClusterState.ACTIVE);
int cnt = KEY_CNT;
@@ -311,7 +312,7 @@ public class GridCacheDhtPreloadDelayedSelfTest extends GridCommonAbstractTest {
Ignite g0 = startGrid(0);
if (persistenceEnabled())
- g0.cluster().active(true);
+ g0.cluster().state(ClusterState.ACTIVE);
int cnt = KEY_CNT;
@@ -361,7 +362,7 @@ public class GridCacheDhtPreloadDelayedSelfTest extends GridCommonAbstractTest {
if (persistenceEnabled()) {
if (i == 0)
- grid(0).cluster().active(true);
+ grid(0).cluster().state(ClusterState.ACTIVE);
else
resetBaselineTopology();
}
@@ -414,7 +415,7 @@ public class GridCacheDhtPreloadDelayedSelfTest extends GridCommonAbstractTest {
IgniteEx crd = startGrid(0);
if (persistenceEnabled())
- crd.cluster().active(true);
+ crd.cluster().state(ClusterState.ACTIVE);
}
finally {
stopAllGrids();
@@ -434,7 +435,7 @@ public class GridCacheDhtPreloadDelayedSelfTest extends GridCommonAbstractTest {
startGridsMultiThreaded(cnt);
if (persistenceEnabled())
- grid(0).cluster().active(true);
+ grid(0).cluster().state(ClusterState.ACTIVE);
U.sleep(2000);
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadWaitForBackupsTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadWaitForBackupsTest.java
index 95402365d04..f45649c7de1 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadWaitForBackupsTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadWaitForBackupsTest.java
@@ -31,6 +31,7 @@ import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.cache.CacheRebalanceMode;
import org.apache.ignite.cache.CacheWriteSynchronizationMode;
import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.DataRegionConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
@@ -166,7 +167,7 @@ public class GridCacheDhtPreloadWaitForBackupsTest extends GridCommonAbstractTes
startGrids(2);
if (persistenceEnabled())
- grid(0).cluster().active(true);
+ grid(0).cluster().state(ClusterState.ACTIVE);
for (int i = 0; i < cacheSize(); i++)
grid(i % 2).cache("cache" + (1 + (i >> 3) % 3)).put(i, new byte[i]);
@@ -204,7 +205,7 @@ public class GridCacheDhtPreloadWaitForBackupsTest extends GridCommonAbstractTes
startGrids(1);
if (persistenceEnabled())
- grid(0).cluster().active(true);
+ grid(0).cluster().state(ClusterState.ACTIVE);
for (int i = 0; i < cacheSize(); i++)
grid(0).cache("cache" + (1 + (i >> 3) % 3)).put(i, new byte[i]);
@@ -253,7 +254,7 @@ public class GridCacheDhtPreloadWaitForBackupsTest extends GridCommonAbstractTes
startGrids(2);
if (persistenceEnabled())
- grid(0).cluster().active(true);
+ grid(0).cluster().state(ClusterState.ACTIVE);
grid(1).cache("cache1").destroy();
grid(1).cache("cache2").destroy();
@@ -292,7 +293,7 @@ public class GridCacheDhtPreloadWaitForBackupsTest extends GridCommonAbstractTes
startGrids(2);
- grid(0).cluster().active(true);
+ grid(0).cluster().state(ClusterState.ACTIVE);
grid(0).context().distributedMetastorage().write(
DistributedMetaStorageImpl.IGNITE_INTERNAL_KEY_PREFIX + "graceful.shutdown",
@@ -330,7 +331,7 @@ public class GridCacheDhtPreloadWaitForBackupsTest extends GridCommonAbstractTes
startGrids(3);
- grid(0).cluster().active(true);
+ grid(0).cluster().state(ClusterState.ACTIVE);
grid(0).context().distributedMetastorage().write(
DistributedMetaStorageImpl.IGNITE_INTERNAL_KEY_PREFIX + "graceful.shutdown",
@@ -372,7 +373,7 @@ public class GridCacheDhtPreloadWaitForBackupsTest extends GridCommonAbstractTes
startGrids(4);
- grid(0).cluster().active(true);
+ grid(0).cluster().state(ClusterState.ACTIVE);
grid(0).context().distributedMetastorage().write(
DistributedMetaStorageImpl.IGNITE_INTERNAL_KEY_PREFIX + "graceful.shutdown",
@@ -428,7 +429,7 @@ public class GridCacheDhtPreloadWaitForBackupsTest extends GridCommonAbstractTes
grid(0).cluster().baselineAutoAdjustEnabled(false);
- grid(0).cluster().active(true);
+ grid(0).cluster().state(ClusterState.ACTIVE);
for (int i = 0; i < cacheSize(); i++)
grid(0).cache("cache" + (1 + (i >> 3) % 3)).put(i, i);
@@ -470,7 +471,7 @@ public class GridCacheDhtPreloadWaitForBackupsTest extends GridCommonAbstractTes
startClientGrid(1);
- grid(0).cluster().active(true);
+ grid(0).cluster().state(ClusterState.ACTIVE);
grid(1).close();
}
@@ -487,7 +488,7 @@ public class GridCacheDhtPreloadWaitForBackupsTest extends GridCommonAbstractTes
startGrids(1);
- grid(0).cluster().active(false);
+ grid(0).cluster().state(ClusterState.INACTIVE);
grid(0).close();
}
@@ -506,7 +507,7 @@ public class GridCacheDhtPreloadWaitForBackupsTest extends GridCommonAbstractTes
startGrids(nodesCnt);
- grid(0).cluster().active(true);
+ grid(0).cluster().state(ClusterState.ACTIVE);
for (int i = 0; i < cacheSize(); i++)
grid(i % 2).cache("cache" + (1 + (i >> 3) % 3)).put(i, i);
@@ -540,7 +541,7 @@ public class GridCacheDhtPreloadWaitForBackupsTest extends GridCommonAbstractTes
ignite(0).cluster().baselineAutoAdjustEnabled(false);
- grid(0).cluster().active(true);
+ grid(0).cluster().state(ClusterState.ACTIVE);
for (int i = nodesCnt / 2; i < nodesCnt; i++)
startGrid(i);
@@ -577,7 +578,7 @@ public class GridCacheDhtPreloadWaitForBackupsTest extends GridCommonAbstractTes
startGrids(nodesCnt);
- grid(0).cluster().active(true);
+ grid(0).cluster().state(ClusterState.ACTIVE);
for (int i = 0; i < cacheSize(); i++)
grid(i % 2).cache("cache" + (1 + (i >> 3) % 3)).put(i, i);
@@ -607,7 +608,7 @@ public class GridCacheDhtPreloadWaitForBackupsTest extends GridCommonAbstractTes
startGrids(2);
- grid(0).cluster().active(true);
+ grid(0).cluster().state(ClusterState.ACTIVE);
for (int i = 0; i < cacheSize(); i++)
grid(i % 2).cache("cache" + (1 + (i >> 3) % 3)).put(i, i);
@@ -639,7 +640,7 @@ public class GridCacheDhtPreloadWaitForBackupsTest extends GridCommonAbstractTes
startGrids(2);
- grid(0).cluster().active(true);
+ grid(0).cluster().state(ClusterState.ACTIVE);
for (int i = 0; i < cacheSize(); i++)
grid(i % 2).cache("cache" + (1 + (i >> 3) % 3)).put(i, i);
@@ -666,7 +667,7 @@ public class GridCacheDhtPreloadWaitForBackupsTest extends GridCommonAbstractTes
startGrids(4);
if (persistenceEnabled())
- grid(0).cluster().active(true);
+ grid(0).cluster().state(ClusterState.ACTIVE);
for (int i = 0; i < cacheSize(); i++)
grid(i % 4).cache("cache" + (1 + (i >> 3) % 3)).put(i, new byte[i]);
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionsStateValidationTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionsStateValidationTest.java
index 29a81a1bbc2..6f84a390500 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionsStateValidationTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionsStateValidationTest.java
@@ -36,6 +36,7 @@ import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.CacheWriteSynchronizationMode;
import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction;
import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.internal.IgniteEx;
@@ -99,7 +100,7 @@ public class GridCachePartitionsStateValidationTest extends GridCommonAbstractTe
@Test
public void testValidationIfPartitionCountersAreInconsistent() throws Exception {
IgniteEx ignite = (IgniteEx)startGrids(2);
- ignite.cluster().active(true);
+ ignite.cluster().state(ClusterState.ACTIVE);
awaitPartitionMapExchange();
@@ -134,7 +135,7 @@ public class GridCachePartitionsStateValidationTest extends GridCommonAbstractTe
// Reopen https://issues.apache.org/jira/browse/IGNITE-10766 if starts failing with forced MVCC
IgniteEx ignite = startGrids(4);
- ignite.cluster().active(true);
+ ignite.cluster().state(ClusterState.ACTIVE);
awaitPartitionMapExchange();
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCacheStartWithLoadTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCacheStartWithLoadTest.java
index 3a1d6c4b32d..8efd27054b6 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCacheStartWithLoadTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCacheStartWithLoadTest.java
@@ -25,6 +25,7 @@ import org.apache.ignite.IgniteCache;
import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.DataRegionConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
@@ -82,7 +83,7 @@ public class IgniteCacheStartWithLoadTest extends GridCommonAbstractTest {
public void testNoRebalanceDuringCacheStart() throws Exception {
IgniteEx crd = (IgniteEx)startGrids(4);
- crd.cluster().active(true);
+ crd.cluster().state(ClusterState.ACTIVE);
AtomicBoolean txLoadStop = new AtomicBoolean();
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheRebalancingPartitionCountersTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheRebalancingPartitionCountersTest.java
index 58f1b82e0a8..59779563f69 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheRebalancingPartitionCountersTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheRebalancingPartitionCountersTest.java
@@ -26,6 +26,7 @@ import java.util.List;
import org.apache.ignite.IgniteCache;
import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.DataRegionConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
@@ -107,7 +108,7 @@ public class GridCacheRebalancingPartitionCountersTest extends GridCommonAbstrac
public void test() throws Exception {
IgniteEx ignite = (IgniteEx)startGrids(3);
- ignite.cluster().active(true);
+ ignite.cluster().state(ClusterState.ACTIVE);
IgniteCache<Integer, Integer> cache = ignite.cache(CACHE_NAME);
@@ -119,7 +120,7 @@ public class GridCacheRebalancingPartitionCountersTest extends GridCommonAbstrac
IgniteEx node = (IgniteEx)ignite(problemNode);
int[] primaryPartitions = node.affinity(CACHE_NAME).primaryPartitions(node.cluster().localNode());
- ignite.cluster().active(false);
+ ignite.cluster().state(ClusterState.INACTIVE);
boolean primaryRemoved = false;
for (int i = 0; i < PARTITIONS_CNT; i++) {
@@ -151,7 +152,7 @@ public class GridCacheRebalancingPartitionCountersTest extends GridCommonAbstrac
assertTrue(primaryRemoved);
- ignite.cluster().active(true);
+ ignite.cluster().state(ClusterState.ACTIVE);
awaitPartitionMapExchange();
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheRebalancingWithAsyncClearingTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheRebalancingWithAsyncClearingTest.java
index aefc1c0a0ea..078f9d9d033 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheRebalancingWithAsyncClearingTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheRebalancingWithAsyncClearingTest.java
@@ -24,6 +24,7 @@ import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.CacheWriteSynchronizationMode;
import org.apache.ignite.cache.PartitionLossPolicy;
import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.DataRegionConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
@@ -120,7 +121,7 @@ public class GridCacheRebalancingWithAsyncClearingTest extends GridCommonAbstrac
@WithSystemProperty(key = IGNITE_PDS_MAX_CHECKPOINT_MEMORY_HISTORY_SIZE, value = "1")
public void testPartitionClearingNotBlockExchange() throws Exception {
IgniteEx ig = (IgniteEx)startGrids(3);
- ig.cluster().active(true);
+ ig.cluster().state(ClusterState.ACTIVE);
// High number of keys triggers long partition eviction.
final int keysCnt = SF.applyLB(300_000, 10_000);
@@ -217,7 +218,7 @@ public class GridCacheRebalancingWithAsyncClearingTest extends GridCommonAbstrac
IgniteEx ignite = startGrids(3);
ignite.cluster().baselineAutoAdjustEnabled(false);
- ignite.cluster().active(true);
+ ignite.cluster().state(ClusterState.ACTIVE);
// High number of keys triggers long partition eviction.
final int keysCnt = SF.applyLB(300_000, 10_000);
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/IgniteRebalanceOnCachesStoppingOrDestroyingTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/IgniteRebalanceOnCachesStoppingOrDestroyingTest.java
index ac1b9674a68..bf744fd3b9d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/IgniteRebalanceOnCachesStoppingOrDestroyingTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/IgniteRebalanceOnCachesStoppingOrDestroyingTest.java
@@ -32,6 +32,7 @@ import org.apache.ignite.IgniteDataStreamer;
import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.DataRegionConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
@@ -142,10 +143,10 @@ public class IgniteRebalanceOnCachesStoppingOrDestroyingTest extends GridCommonA
*/
private void testStopCachesOnDeactivation(String groupName) throws Exception {
performTest(ig -> {
- ig.cluster().active(false);
+ ig.cluster().state(ClusterState.INACTIVE);
// Add to escape possible long waiting in awaitPartitionMapExchange due to {@link CacheAffinityChangeMessage}.
- ig.cluster().active(true);
+ ig.cluster().state(ClusterState.ACTIVE);
return null;
}, groupName);
@@ -213,7 +214,7 @@ public class IgniteRebalanceOnCachesStoppingOrDestroyingTest extends GridCommonA
private void performTest(IgniteThrowableFunction<Ignite, Void> testAction, String groupName) throws Exception {
IgniteEx ig0 = (IgniteEx)startGrids(2);
- ig0.cluster().active(true);
+ ig0.cluster().state(ClusterState.ACTIVE);
stopGrid(1);
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/RebalanceStatisticsTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/RebalanceStatisticsTest.java
index 304eea55bed..eb614bab253 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/RebalanceStatisticsTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/RebalanceStatisticsTest.java
@@ -30,6 +30,7 @@ import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction;
import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.internal.IgniteEx;
@@ -241,7 +242,7 @@ public class RebalanceStatisticsTest extends GridCommonAbstractTest {
};
IgniteEx crd = startGrids(nodeCnt);
- crd.cluster().active(true);
+ crd.cluster().state(ClusterState.ACTIVE);
populateCluster(crd, 10, "");
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/paged/PageEvictionMultinodeMixedRegionsTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/paged/PageEvictionMultinodeMixedRegionsTest.java
index 5bcff9f561d..7e90f5ff13f 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/paged/PageEvictionMultinodeMixedRegionsTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/paged/PageEvictionMultinodeMixedRegionsTest.java
@@ -17,6 +17,7 @@
package org.apache.ignite.internal.processors.cache.eviction.paged;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.DataPageEvictionMode;
import org.apache.ignite.configuration.DataRegionConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
@@ -47,7 +48,7 @@ public class PageEvictionMultinodeMixedRegionsTest extends PageEvictionMultinode
super.beforeTestsStarted();
- clientGrid().cluster().active(true);
+ clientGrid().cluster().state(ClusterState.ACTIVE);
}
/** {@inheritDoc} */
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccAbstractBasicCoordinatorFailoverTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccAbstractBasicCoordinatorFailoverTest.java
index 619a0492e22..42bed2a5924 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccAbstractBasicCoordinatorFailoverTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccAbstractBasicCoordinatorFailoverTest.java
@@ -36,6 +36,7 @@ import org.apache.ignite.IgniteCache;
import org.apache.ignite.cache.query.QueryCursor;
import org.apache.ignite.cache.query.ScanQuery;
import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.cluster.ClusterTopologyException;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.internal.IgniteEx;
@@ -763,7 +764,7 @@ public abstract class CacheMvccAbstractBasicCoordinatorFailoverTest extends Cach
Ignite nearNode = survivors.get(0);
if (persistence)
- nearNode.cluster().active(true);
+ nearNode.cluster().state(ClusterState.ACTIVE);
CacheConfiguration ccfg = cacheConfiguration(cacheMode(), FULL_SYNC, DATA_NODES - 1, DFLT_PARTITION_COUNT)
.setNodeFilter(new CoordinatorNodeFilter());
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccConfigurationValidationTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccConfigurationValidationTest.java
index 1cc0abe3efe..aebc120ac60 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccConfigurationValidationTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccConfigurationValidationTest.java
@@ -30,6 +30,7 @@ import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.CacheInterceptor;
import org.apache.ignite.cache.CacheRebalanceMode;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.DataRegionConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
@@ -146,7 +147,7 @@ public class CacheMvccConfigurationValidationTest extends GridCommonAbstractTest
Ignite node = startGrid(cfg);
- node.cluster().active(true);
+ node.cluster().state(ClusterState.ACTIVE);
CacheConfiguration ccfg1 = new CacheConfiguration("test1").setAtomicityMode(TRANSACTIONAL);
@@ -195,7 +196,7 @@ public class CacheMvccConfigurationValidationTest extends GridCommonAbstractTest
Ignite node = startGrid(cfg);
- node.cluster().active(true);
+ node.cluster().state(ClusterState.ACTIVE);
CacheConfiguration ccfg1 = new CacheConfiguration("test1").setAtomicityMode(TRANSACTIONAL_SNAPSHOT);
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccPartitionedCoordinatorFailoverTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccPartitionedCoordinatorFailoverTest.java
index 7e6386640c3..eb27ce19d8b 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccPartitionedCoordinatorFailoverTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccPartitionedCoordinatorFailoverTest.java
@@ -20,6 +20,7 @@ package org.apache.ignite.internal.processors.cache.mvcc;
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCache;
import org.apache.ignite.cache.CacheMode;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.CacheConfiguration;
import org.junit.Test;
@@ -177,17 +178,17 @@ public class CacheMvccPartitionedCoordinatorFailoverTest extends CacheMvccAbstra
CacheConfiguration ccfg = cacheConfiguration(cacheMode(), FULL_SYNC, DATA_NODES - 1, DFLT_PARTITION_COUNT);
- near.cluster().active(true);
+ near.cluster().state(ClusterState.ACTIVE);
IgniteCache cache = near.createCache(ccfg);
cache.put(1, 1);
- near.cluster().active(false);
+ near.cluster().state(ClusterState.INACTIVE);
stopGrid(0);
- near.cluster().active(true);
+ near.cluster().state(ClusterState.ACTIVE);
assertEquals(1, cache.get(1));
}
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccProcessorLazyStartTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccProcessorLazyStartTest.java
index a75bf95967d..884408db3d2 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccProcessorLazyStartTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccProcessorLazyStartTest.java
@@ -20,6 +20,7 @@ import org.apache.ignite.IgniteCache;
import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.cache.CacheWriteSynchronizationMode;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.internal.IgniteEx;
@@ -95,7 +96,7 @@ public class CacheMvccProcessorLazyStartTest extends CacheMvccAbstractTest {
assertFalse(mvccEnabled(node1));
assertFalse(mvccEnabled(node2));
- node1.cluster().active(true);
+ node1.cluster().state(ClusterState.ACTIVE);
assertFalse(mvccEnabled(node1));
assertFalse(mvccEnabled(node2));
@@ -116,7 +117,7 @@ public class CacheMvccProcessorLazyStartTest extends CacheMvccAbstractTest {
node1 = startGrid(1);
node2 = startGrid(2);
- node1.cluster().active(true);
+ node1.cluster().state(ClusterState.ACTIVE);
assertTrue(mvccEnabled(node1));
assertTrue(mvccEnabled(node2));
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccProcessorTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccProcessorTest.java
index 06ef266080a..5b38deef66c 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccProcessorTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccProcessorTest.java
@@ -19,6 +19,7 @@ package org.apache.ignite.internal.processors.cache.mvcc;
import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.CacheMode;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.internal.IgniteEx;
import org.apache.ignite.internal.processors.cache.mvcc.txlog.TxState;
@@ -61,7 +62,7 @@ public class CacheMvccProcessorTest extends CacheMvccAbstractTest {
private void checkTreeOperations() throws Exception {
IgniteEx grid = startGrid(0);
- grid.cluster().active(true);
+ grid.cluster().state(ClusterState.ACTIVE);
grid.createCache(new CacheConfiguration<>("test").setAtomicityMode(CacheAtomicityMode.TRANSACTIONAL_SNAPSHOT));
@@ -86,7 +87,7 @@ public class CacheMvccProcessorTest extends CacheMvccAbstractTest {
stopGrid(0, false);
grid = startGrid(0);
- grid.cluster().active(true);
+ grid.cluster().state(ClusterState.ACTIVE);
mvccProcessor = mvccProcessor(grid);
}
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccTransactionsTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccTransactionsTest.java
index 8392048d209..112ae862662 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccTransactionsTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccTransactionsTest.java
@@ -54,6 +54,7 @@ import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.cache.affinity.Affinity;
import org.apache.ignite.cache.query.ScanQuery;
import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.cluster.ClusterTopologyException;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.internal.IgniteEx;
@@ -2497,7 +2498,7 @@ public class CacheMvccTransactionsTest extends CacheMvccAbstractTest {
startGrid(i);
if (persistence && i == 0)
- ignite(i).active(true);
+ ignite(i).cluster().state(ClusterState.ACTIVE);
checkCoordinatorsConsistency(i + 1);
}
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccTxFailoverTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccTxFailoverTest.java
index bc1275e8c70..d4c3e4b07f0 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccTxFailoverTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccTxFailoverTest.java
@@ -23,6 +23,7 @@ import org.apache.ignite.IgniteCache;
import org.apache.ignite.IgniteTransactions;
import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.CacheWriteSynchronizationMode;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.DataRegionConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
@@ -141,7 +142,7 @@ public class CacheMvccTxFailoverTest extends GridCommonAbstractTest {
public void checkSingleNodeRestart(boolean rollBack, boolean recoverFromWAL, boolean omitTxFinish) throws Exception {
IgniteEx node = startGrid(0);
- node.cluster().active(true);
+ node.cluster().state(ClusterState.ACTIVE);
IgniteCache<Integer, Integer> cache = node.getOrCreateCache(DEFAULT_CACHE_NAME);
@@ -192,7 +193,7 @@ public class CacheMvccTxFailoverTest extends GridCommonAbstractTest {
node = startGrid(0);
- node.cluster().active(true);
+ node.cluster().state(ClusterState.ACTIVE);
cache = node.cache(DEFAULT_CACHE_NAME);
@@ -218,7 +219,7 @@ public class CacheMvccTxFailoverTest extends GridCommonAbstractTest {
startGrid(1);
- node.cluster().active(true);
+ node.cluster().state(ClusterState.ACTIVE);
final CyclicBarrier barrier = new CyclicBarrier(2);
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccVacuumTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccVacuumTest.java
index 6d46b539fb8..4a8d433c5ef 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccVacuumTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccVacuumTest.java
@@ -26,6 +26,7 @@ import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.cache.CacheWriteSynchronizationMode;
import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.internal.processors.cache.mvcc.txlog.TxLog;
@@ -90,7 +91,7 @@ public class CacheMvccVacuumTest extends CacheMvccAbstractTest {
ensureNoVacuum(node0);
ensureNoVacuum(node1);
- node1.cluster().active(true);
+ node1.cluster().state(ClusterState.ACTIVE);
ensureNoVacuum(node0);
ensureNoVacuum(node1);
@@ -110,12 +111,12 @@ public class CacheMvccVacuumTest extends CacheMvccAbstractTest {
ensureVacuum(node0);
ensureVacuum(node1);
- node1.cluster().active(false);
+ node1.cluster().state(ClusterState.INACTIVE);
ensureNoVacuum(node0);
ensureNoVacuum(node1);
- node1.cluster().active(true);
+ node1.cluster().state(ClusterState.ACTIVE);
ensureVacuum(node0);
ensureVacuum(node1);
@@ -133,7 +134,7 @@ public class CacheMvccVacuumTest extends CacheMvccAbstractTest {
node0 = startGrid(0);
node1 = startGrid(1);
- node1.cluster().active(true);
+ node1.cluster().state(ClusterState.ACTIVE);
ensureVacuum(node0);
ensureVacuum(node1);
@@ -175,7 +176,7 @@ public class CacheMvccVacuumTest extends CacheMvccAbstractTest {
node0.cluster().baselineAutoAdjustEnabled(false);
ensureNoVacuum(node0);
- node0.cluster().active(true);
+ node0.cluster().state(ClusterState.ACTIVE);
IgniteCache<Object, Object> cache = node0.createCache(
cacheConfiguration(PARTITIONED, CacheWriteSynchronizationMode.FULL_SYNC, 1, 16));
@@ -207,7 +208,7 @@ public class CacheMvccVacuumTest extends CacheMvccAbstractTest {
Ignite node1 = startGrid(1);
node0.cluster().baselineAutoAdjustEnabled(false);
- node0.cluster().active(true);
+ node0.cluster().state(ClusterState.ACTIVE);
IgniteCache<Object, Object> cache = node0.createCache(
cacheConfiguration(PARTITIONED, CacheWriteSynchronizationMode.FULL_SYNC, 1, 16));
@@ -250,7 +251,7 @@ public class CacheMvccVacuumTest extends CacheMvccAbstractTest {
ensureNoVacuum(node0);
ensureNoVacuum(node1);
- node0.cluster().active(true);
+ node0.cluster().state(ClusterState.ACTIVE);
IgniteCache<Object, Object> cache = node0.createCache(
cacheConfiguration(PARTITIONED, CacheWriteSynchronizationMode.FULL_SYNC, 1, 16)
@@ -261,7 +262,7 @@ public class CacheMvccVacuumTest extends CacheMvccAbstractTest {
ensureVacuum(node0);
ensureNoVacuum(node1);
- node0.cluster().active(false);
+ node0.cluster().state(ClusterState.INACTIVE);
ensureNoVacuum(node0);
ensureNoVacuum(node1);
@@ -271,7 +272,7 @@ public class CacheMvccVacuumTest extends CacheMvccAbstractTest {
ensureNoVacuum(node0);
ensureNoVacuum(node1);
- node0.cluster().active(true);
+ node0.cluster().state(ClusterState.ACTIVE);
node0.cluster().setBaselineTopology(Collections.singleton(node0.cluster().node()));
ensureVacuum(node0);
@@ -302,7 +303,7 @@ public class CacheMvccVacuumTest extends CacheMvccAbstractTest {
ensureNoVacuum(node);
- node.cluster().active(true);
+ node.cluster().state(ClusterState.ACTIVE);
ensureNoVacuum(node);
}
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/CleanupRestoredCachesSlowTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/CleanupRestoredCachesSlowTest.java
index 1ecdcdc5858..ff66625cb6e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/CleanupRestoredCachesSlowTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/CleanupRestoredCachesSlowTest.java
@@ -26,6 +26,7 @@ import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCache;
import org.apache.ignite.IgniteLogger;
import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.DataRegionConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
@@ -171,7 +172,7 @@ public class CleanupRestoredCachesSlowTest extends GridCommonAbstractTest implem
ClusterNode cn0 = grid(0).cluster().localNode();
ClusterNode cn1 = grid(1).cluster().localNode();
- ignite.cluster().active(true);
+ ignite.cluster().state(ClusterState.ACTIVE);
ignite.cluster().baselineAutoAdjustEnabled(false);
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/CommonPoolStarvationCheckpointTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/CommonPoolStarvationCheckpointTest.java
index 59051e438ab..bbb2d2a4ea7 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/CommonPoolStarvationCheckpointTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/CommonPoolStarvationCheckpointTest.java
@@ -25,6 +25,7 @@ import org.apache.ignite.IgniteSystemProperties;
import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.CacheWriteSynchronizationMode;
import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.DataRegionConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
@@ -99,7 +100,7 @@ public class CommonPoolStarvationCheckpointTest extends GridCommonAbstractTest {
public void testCommonPoolStarvation() throws Exception {
IgniteEx grid = startGrid(0);
- grid.cluster().active(true);
+ grid.cluster().state(ClusterState.ACTIVE);
IgniteCache<Integer, OnePageValue> cache = grid.cache(CACHE_NAME);
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgniteBaselineAffinityTopologyActivationTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgniteBaselineAffinityTopologyActivationTest.java
index 743dcff6b02..9b740f6b926 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgniteBaselineAffinityTopologyActivationTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgniteBaselineAffinityTopologyActivationTest.java
@@ -31,6 +31,7 @@ import org.apache.ignite.cache.CacheWriteSynchronizationMode;
import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction;
import org.apache.ignite.cluster.BaselineNode;
import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.DataRegionConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
@@ -122,12 +123,12 @@ public class IgniteBaselineAffinityTopologyActivationTest extends GridCommonAbst
public void testAutoActivationWithCompatibleOldNode() throws Exception {
startGridWithConsistentId("A");
startGridWithConsistentId("B");
- startGridWithConsistentId("C").cluster().active(true);
+ startGridWithConsistentId("C").cluster().state(ClusterState.ACTIVE);
stopAllGrids(false);
startGridWithConsistentId("A");
- startGridWithConsistentId("B").cluster().active(true);
+ startGridWithConsistentId("B").cluster().state(ClusterState.ACTIVE);
{
IgniteEx nodeA = grid("A");
@@ -135,7 +136,7 @@ public class IgniteBaselineAffinityTopologyActivationTest extends GridCommonAbst
assertNotNull(nodeA.cluster().currentBaselineTopology());
assertEquals(3, nodeA.cluster().currentBaselineTopology().size());
- assertTrue(nodeA.cluster().active());
+ assertTrue(nodeA.cluster().state().active());
}
stopAllGrids(false);
@@ -149,7 +150,7 @@ public class IgniteBaselineAffinityTopologyActivationTest extends GridCommonAbst
assertNotNull(nodeA.cluster().currentBaselineTopology());
assertEquals(3, nodeA.cluster().currentBaselineTopology().size());
- assertFalse(nodeA.cluster().active());
+ assertFalse(nodeA.cluster().state().active());
}
final Ignite nodeC = startGridWithConsistentId("C");
@@ -157,7 +158,7 @@ public class IgniteBaselineAffinityTopologyActivationTest extends GridCommonAbst
boolean active = GridTestUtils.waitForCondition(
new GridAbsPredicate() {
@Override public boolean apply() {
- return nodeC.cluster().active();
+ return nodeC.cluster().state().active();
}
},
10_000
@@ -175,7 +176,7 @@ public class IgniteBaselineAffinityTopologyActivationTest extends GridCommonAbst
Ignite ignite = startGridWithConsistentId("A");
ignite.cluster().baselineAutoAdjustEnabled(false);
- ignite.cluster().active(true);
+ ignite.cluster().state(ClusterState.ACTIVE);
long singleNodeTopVer = ignite.cluster().topologyVersion();
@@ -209,7 +210,7 @@ public class IgniteBaselineAffinityTopologyActivationTest extends GridCommonAbst
Ignite nodeC = startGridWithConsistentId("OnlineConsID");
nodeC.cluster().baselineAutoAdjustEnabled(false);
- nodeC.cluster().active(true);
+ nodeC.cluster().state(ClusterState.ACTIVE);
boolean expectedExceptionIsThrown = false;
@@ -238,18 +239,18 @@ public class IgniteBaselineAffinityTopologyActivationTest extends GridCommonAbst
Ignite nodeC = startGridWithConsistentId("C");
nodeC.cluster().baselineAutoAdjustEnabled(false);
- nodeC.active(true);
+ nodeC.cluster().state(ClusterState.ACTIVE);
stopAllGrids(false);
Ignite nodeA = startGridWithConsistentId("A");
- startGridWithConsistentId("B").active(true);
+ startGridWithConsistentId("B").cluster().state(ClusterState.ACTIVE);
nodeA.cluster().setBaselineTopology(baselineNodes(nodeA.cluster().forServers().nodes()));
stopAllGrids(false);
- startGridWithConsistentId("C").active(true);
+ startGridWithConsistentId("C").cluster().state(ClusterState.ACTIVE);
stopGrid("C", false);
@@ -285,16 +286,16 @@ public class IgniteBaselineAffinityTopologyActivationTest extends GridCommonAbst
public void testIncompatibleBltNodeIsProhibitedToJoinCluster() throws Exception {
startGridWithConsistentId("A");
startGridWithConsistentId("B");
- startGridWithConsistentId("C").cluster().active(true);
+ startGridWithConsistentId("C").cluster().state(ClusterState.ACTIVE);
stopAllGrids(false);
startGridWithConsistentId("A");
- startGridWithConsistentId("B").cluster().active(true);
+ startGridWithConsistentId("B").cluster().state(ClusterState.ACTIVE);
stopAllGrids(false);
- startGridWithConsistentId("C").cluster().active(true);
+ startGridWithConsistentId("C").cluster().state(ClusterState.ACTIVE);
stopAllGrids(false);
@@ -359,7 +360,7 @@ public class IgniteBaselineAffinityTopologyActivationTest extends GridCommonAbst
Ignite nodeB = startGridWithConsistentId("B");
Ignite nodeC = startGridWithConsistentId("C");
- nodeC.cluster().active(true);
+ nodeC.cluster().state(ClusterState.ACTIVE);
verifyBaselineTopologyOnNodes(verifier1, new Ignite[] {nodeA, nodeB, nodeC});
stopAllGrids(false);
@@ -367,7 +368,7 @@ public class IgniteBaselineAffinityTopologyActivationTest extends GridCommonAbst
nodeA = startGridWithConsistentId("A");
nodeB = startGridWithConsistentId("B");
- nodeB.cluster().active(true);
+ nodeB.cluster().state(ClusterState.ACTIVE);
verifyBaselineTopologyOnNodes(verifier2, new Ignite[] {nodeA, nodeB});
@@ -398,7 +399,7 @@ public class IgniteBaselineAffinityTopologyActivationTest extends GridCommonAbst
IgniteEx grid = grid("B");
grid.cluster().baselineAutoAdjustEnabled(false);
- grid.cluster().active(true);
+ grid.cluster().state(ClusterState.ACTIVE);
IgniteCache<Object, Object> cache = grid.getOrCreateCache(CACHE_NAME);
@@ -496,7 +497,7 @@ public class IgniteBaselineAffinityTopologyActivationTest extends GridCommonAbst
public void testNodeWithBltIsNotAllowedToJoinClusterDuringFirstActivation() throws Exception {
Ignite nodeC = startGridWithConsistentId("C");
- nodeC.cluster().active(true);
+ nodeC.cluster().state(ClusterState.ACTIVE);
stopGrid("C", false);
@@ -513,7 +514,7 @@ public class IgniteBaselineAffinityTopologyActivationTest extends GridCommonAbst
GridTestUtils.runAsync(
() -> {
try {
- nodeA.cluster().active(true);
+ nodeA.cluster().state(ClusterState.ACTIVE);
}
catch (Exception e) {
log.warning("Exception during activation", e);
@@ -550,7 +551,7 @@ public class IgniteBaselineAffinityTopologyActivationTest extends GridCommonAbst
Ignite nodeB = startGridWithConsistentId("B");
Ignite nodeC = startGridWithConsistentId("C");
- nodeC.cluster().active(true);
+ nodeC.cluster().state(ClusterState.ACTIVE);
BaselineTopologyVerifier verifier1 = new BaselineTopologyVerifier() {
@Override public void verify(BaselineTopology blt) {
@@ -570,7 +571,7 @@ public class IgniteBaselineAffinityTopologyActivationTest extends GridCommonAbst
nodeD = startGridWithConsistentId("D");
- assertFalse(nodeD.cluster().active());
+ assertFalse(nodeD.cluster().state().active());
verifyBaselineTopologyOnNodes(verifier1, new Ignite[] {nodeD});
}
@@ -599,7 +600,7 @@ public class IgniteBaselineAffinityTopologyActivationTest extends GridCommonAbst
Ignite nodeC = startGridWithConsistentId("C");
nodeA.cluster().baselineAutoAdjustEnabled(false);
- nodeC.cluster().active(true);
+ nodeC.cluster().state(ClusterState.ACTIVE);
stopGrid("B", false);
@@ -607,7 +608,7 @@ public class IgniteBaselineAffinityTopologyActivationTest extends GridCommonAbst
boolean activated = GridTestUtils.waitForCondition(new GridAbsPredicate() {
@Override public boolean apply() {
- return grid("A").active();
+ return grid("A").cluster().state().active();
}
}, 10_000);
@@ -622,7 +623,7 @@ public class IgniteBaselineAffinityTopologyActivationTest extends GridCommonAbst
activated = GridTestUtils.waitForCondition(new GridAbsPredicate() {
@Override public boolean apply() {
- return grid("A").active();
+ return grid("A").cluster().state().active();
}
}, 10_000);
@@ -655,7 +656,7 @@ public class IgniteBaselineAffinityTopologyActivationTest extends GridCommonAbst
Ignite nodeC = startGridWithConsistentId("C");
nodeA.cluster().baselineAutoAdjustEnabled(false);
- nodeC.cluster().active(true);
+ nodeC.cluster().state(ClusterState.ACTIVE);
IgniteEx nodeD = (IgniteEx)startGridWithConsistentId("D");
@@ -680,7 +681,7 @@ public class IgniteBaselineAffinityTopologyActivationTest extends GridCommonAbst
Ignite nodeC = startGridWithConsistentId("C");
nodeA.cluster().baselineAutoAdjustEnabled(false);
- nodeA.cluster().active(true);
+ nodeA.cluster().state(ClusterState.ACTIVE);
nodeA.cluster().setBaselineTopology(null);
@@ -742,11 +743,11 @@ public class IgniteBaselineAffinityTopologyActivationTest extends GridCommonAbst
Ignite nodeA = startGridWithConsistentId("A");
- nodeA.cluster().active(true);
+ nodeA.cluster().state(ClusterState.ACTIVE);
Ignite nodeB = startGridWithConsistentId("B");
- nodeA.cluster().active(true);
+ nodeA.cluster().state(ClusterState.ACTIVE);
verifyBaselineTopologyOnNodes(verifier, new Ignite[] {nodeA, nodeB});
}
@@ -769,7 +770,7 @@ public class IgniteBaselineAffinityTopologyActivationTest extends GridCommonAbst
IgniteEx srv = grid(0);
- srv.cluster().active(true);
+ srv.cluster().state(ClusterState.ACTIVE);
createAndFillCache(srv);
@@ -784,7 +785,7 @@ public class IgniteBaselineAffinityTopologyActivationTest extends GridCommonAbst
boolean clusterActive = GridTestUtils.waitForCondition(
new GridAbsPredicate() {
@Override public boolean apply() {
- return ig.cluster().active();
+ return ig.cluster().state().active();
}
},
10_000);
@@ -803,21 +804,21 @@ public class IgniteBaselineAffinityTopologyActivationTest extends GridCommonAbst
IgniteEx srv = grid(0);
- srv.cluster().active(true);
+ srv.cluster().state(ClusterState.ACTIVE);
awaitPartitionMapExchange();
- assertTrue(srv.cluster().active());
+ assertTrue(srv.cluster().state().active());
- srv.cluster().active(false);
+ srv.cluster().state(ClusterState.INACTIVE);
- assertFalse(srv.cluster().active());
+ assertFalse(srv.cluster().state().active());
startGrid(2);
Thread.sleep(3_000);
- assertFalse(srv.cluster().active());
+ assertFalse(srv.cluster().state().active());
}
/**
@@ -829,13 +830,13 @@ public class IgniteBaselineAffinityTopologyActivationTest extends GridCommonAbst
IgniteEx srv = grid(0);
- srv.cluster().active(true);
+ srv.cluster().state(ClusterState.ACTIVE);
awaitPartitionMapExchange();
- assertTrue(srv.cluster().active());
+ assertTrue(srv.cluster().state().active());
- srv.cluster().active(false);
+ srv.cluster().state(ClusterState.INACTIVE);
BaselineTopology blt = getBaselineTopology(srv);
@@ -878,7 +879,7 @@ public class IgniteBaselineAffinityTopologyActivationTest extends GridCommonAbst
startGridWithConsistentId("C");
nodeA.cluster().baselineAutoAdjustEnabled(false);
- nodeA.cluster().active(true);
+ nodeA.cluster().state(ClusterState.ACTIVE);
stopGrid("C", false);
@@ -931,7 +932,7 @@ public class IgniteBaselineAffinityTopologyActivationTest extends GridCommonAbst
startGridWithConsistentId("C");
nodeA.cluster().baselineAutoAdjustEnabled(false);
- nodeA.cluster().active(true);
+ nodeA.cluster().state(ClusterState.ACTIVE);
stopGrid("C", false);
@@ -960,11 +961,11 @@ public class IgniteBaselineAffinityTopologyActivationTest extends GridCommonAbst
startGridWithConsistentId("B");
startGridWithConsistentId("C");
- nodeA.cluster().active(true);
+ nodeA.cluster().state(ClusterState.ACTIVE);
assertNotNull(nodeA.cluster().currentBaselineTopology());
- nodeA.cluster().active(false);
+ nodeA.cluster().state(ClusterState.INACTIVE);
stopAllGrids();
@@ -977,7 +978,7 @@ public class IgniteBaselineAffinityTopologyActivationTest extends GridCommonAbst
boolean clusterActive = GridTestUtils.waitForCondition(
new GridAbsPredicate() {
@Override public boolean apply() {
- return ig.cluster().active();
+ return ig.cluster().state().active();
}
},
10_000);
@@ -1000,7 +1001,7 @@ public class IgniteBaselineAffinityTopologyActivationTest extends GridCommonAbst
Ignite nodeC = startGridWithConsistentId("C");
- nodeC.cluster().active(true);
+ nodeC.cluster().state(ClusterState.ACTIVE);
stopGrid("C", false);
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgniteDataStorageMetricsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgniteDataStorageMetricsSelfTest.java
index abe7ebd2826..88002b9eddb 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgniteDataStorageMetricsSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgniteDataStorageMetricsSelfTest.java
@@ -38,6 +38,7 @@ import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction;
import org.apache.ignite.cache.query.annotations.QuerySqlField;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.BinaryConfiguration;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.DataRegionConfiguration;
@@ -202,7 +203,7 @@ public class IgniteDataStorageMetricsSelfTest extends GridCommonAbstractTest {
public void testPersistenceMetrics() throws Exception {
final IgniteEx ig = startGrid(0);
- ig.active(true);
+ ig.cluster().state(ClusterState.ACTIVE);
try {
IgniteCache<Object, Object> cache = ig.cache("cache");
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgniteLostPartitionsOnLeaveBaselineSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgniteLostPartitionsOnLeaveBaselineSelfTest.java
index 2d1f5ce3cdf..0e9b9a1800c 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgniteLostPartitionsOnLeaveBaselineSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgniteLostPartitionsOnLeaveBaselineSelfTest.java
@@ -21,6 +21,7 @@ import java.util.Arrays;
import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.cache.PartitionLossPolicy;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.DataRegionConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
@@ -136,7 +137,7 @@ public class IgniteLostPartitionsOnLeaveBaselineSelfTest extends GridCommonAbstr
final IgniteEx gridFirst = startGrid(0);
startGrid(1);
- gridFirst.cluster().active(true);
+ gridFirst.cluster().state(ClusterState.ACTIVE);
gridFirst.getOrCreateCaches(Arrays.asList(
cacheConfiguration("cache-no-persistence", PARTITIONED, ATOMIC, "no-persistence"),
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsBinaryMetadataAsyncWritingTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsBinaryMetadataAsyncWritingTest.java
index c1d5f9e958c..1eefddc0781 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsBinaryMetadataAsyncWritingTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsBinaryMetadataAsyncWritingTest.java
@@ -136,7 +136,7 @@ public class IgnitePdsBinaryMetadataAsyncWritingTest extends GridCommonAbstractT
final CountDownLatch fileWriteLatch = initSlowFileIOFactory();
Ignite ig = startGrid(0);
- ig.cluster().active(true);
+ ig.cluster().state(ClusterState.ACTIVE);
IgniteCache<Object, Object> cache = ig.cache(DEFAULT_CACHE_NAME);
GridTestUtils.runAsync(() -> cache.put(0, new TestAddress(0, "USA", "NYC", "Park Ave")));
@@ -159,7 +159,7 @@ public class IgnitePdsBinaryMetadataAsyncWritingTest extends GridCommonAbstractT
IgniteEx ig0 = startGrid(0);
IgniteEx ig1 = startGrid(1);
- ig0.cluster().active(true);
+ ig0.cluster().state(ClusterState.ACTIVE);
IgniteCache<Object, Object> cache = ig0.cache(DEFAULT_CACHE_NAME);
int key = findAffinityKeyForNode(ig0.affinity(DEFAULT_CACHE_NAME), ig1.localNode());
@@ -190,7 +190,7 @@ public class IgnitePdsBinaryMetadataAsyncWritingTest extends GridCommonAbstractT
Ignite ig = startGrid();
- ig.cluster().active(true);
+ ig.cluster().state(ClusterState.ACTIVE);
IgniteCache<Object, Object> cache = ig.cache(DEFAULT_CACHE_NAME);
@@ -212,7 +212,7 @@ public class IgnitePdsBinaryMetadataAsyncWritingTest extends GridCommonAbstractT
IgniteKernal ig = (IgniteKernal)startGrid();
- ig.cluster().active(true);
+ ig.cluster().state(ClusterState.ACTIVE);
IgniteCache<Object, Object> cache = ig.cache(DEFAULT_CACHE_NAME);
@@ -285,7 +285,7 @@ public class IgnitePdsBinaryMetadataAsyncWritingTest extends GridCommonAbstractT
specialFileIOFactory = null;
IgniteEx ig2 = startGrid(2);
- ig0.cluster().active(true);
+ ig0.cluster().state(ClusterState.ACTIVE);
int key0 = findAffinityKeyForNode(ig0.affinity(DEFAULT_CACHE_NAME), ig1.localNode());
int key1 = findAffinityKeyForNode(ig0.affinity(DEFAULT_CACHE_NAME), ig1.localNode(), key0);
@@ -349,7 +349,7 @@ public class IgnitePdsBinaryMetadataAsyncWritingTest extends GridCommonAbstractT
startGrid(2);
- ig0.cluster().active(true);
+ ig0.cluster().state(ClusterState.ACTIVE);
IgniteCache cache0 = cl0.createCache(testCacheCfg);
int key0 = findAffinityKeyForNode(ig0.affinity(cacheName), ig0.localNode());
@@ -404,7 +404,7 @@ public class IgnitePdsBinaryMetadataAsyncWritingTest extends GridCommonAbstractT
specialFileIOFactory = null;
IgniteEx ig2 = startGrid(2);
- ig0.cluster().active(true);
+ ig0.cluster().state(ClusterState.ACTIVE);
IgniteEx cl0 = startGrid("client0");
@@ -510,7 +510,7 @@ public class IgnitePdsBinaryMetadataAsyncWritingTest extends GridCommonAbstractT
specialFileIOFactory = null;
startGrid(3);
- ig0.cluster().active(true);
+ ig0.cluster().state(ClusterState.ACTIVE);
IgniteCache cache = ig0.createCache(testCacheCfg);
int key = 0;
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsBinaryMetadataOnClusterRestartTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsBinaryMetadataOnClusterRestartTest.java
index f5573749e5e..3c086b64bbe 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsBinaryMetadataOnClusterRestartTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsBinaryMetadataOnClusterRestartTest.java
@@ -33,6 +33,7 @@ import org.apache.ignite.cache.CacheKeyConfiguration;
import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.cache.affinity.AffinityKeyMapped;
import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.BinaryConfiguration;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.DataRegionConfiguration;
@@ -120,7 +121,7 @@ public class IgnitePdsBinaryMetadataOnClusterRestartTest extends GridCommonAbstr
Ignite ignite0 = startGridInASeparateWorkDir("A");
Ignite ignite1 = startGridInASeparateWorkDir("B");
- ignite0.active(true);
+ ignite0.cluster().state(ClusterState.ACTIVE);
IgniteCache<Object, Object> cache0 = ignite0.cache(CACHE_NAME);
@@ -175,7 +176,7 @@ public class IgnitePdsBinaryMetadataOnClusterRestartTest extends GridCommonAbstr
Ignite ignite0 = startGridInASeparateWorkDir("A");
Ignite ignite1 = startGridInASeparateWorkDir("B");
- ignite0.active(true);
+ ignite0.cluster().state(ClusterState.ACTIVE);
IgniteCache<Object, Object> cache0 = ignite0.cache(CACHE_NAME);
@@ -233,7 +234,7 @@ public class IgnitePdsBinaryMetadataOnClusterRestartTest extends GridCommonAbstr
Ignite igniteC = startGridInASeparateWorkDir("C");
startGridInASeparateWorkDir("D");
- igniteA.active(true);
+ igniteA.cluster().state(ClusterState.ACTIVE);
BinaryObject bObj0 = igniteA.binary()
.builder(DYNAMIC_TYPE_NAME).setField(DYNAMIC_INT_FIELD_NAME, 10).build();
@@ -269,7 +270,7 @@ public class IgnitePdsBinaryMetadataOnClusterRestartTest extends GridCommonAbstr
Ignite igniteB = startGridInASeparateWorkDir("B");
- igniteB.active(true);
+ igniteB.cluster().state(ClusterState.ACTIVE);
bObj1 = (BinaryObject)igniteB.cache(CACHE_NAME).withKeepBinary().get(1);
@@ -304,7 +305,7 @@ public class IgnitePdsBinaryMetadataOnClusterRestartTest extends GridCommonAbstr
String bConsId = igniteB.cluster().localNode().consistentId().toString();
- igniteA.active(true);
+ igniteA.cluster().state(ClusterState.ACTIVE);
IgniteCache<Object, Object> cache = igniteA.cache(CACHE_NAME);
@@ -319,7 +320,7 @@ public class IgnitePdsBinaryMetadataOnClusterRestartTest extends GridCommonAbstr
Ignite igniteC = startGridInASeparateWorkDir("C");
String cConsId = igniteC.cluster().localNode().consistentId().toString();
- igniteC.active(true);
+ igniteC.cluster().state(ClusterState.ACTIVE);
cache = igniteC.cache(CACHE_NAME);
bObj = igniteC.binary().builder(DYNAMIC_TYPE_NAME).setField(decimalFieldName, 10L).build();
@@ -390,7 +391,7 @@ public class IgnitePdsBinaryMetadataOnClusterRestartTest extends GridCommonAbstr
Ignite ignite0 = grid(0);
- ignite0.active(true);
+ ignite0.cluster().state(ClusterState.ACTIVE);
IgniteCache<Object, Object> cache0 = ignite0.cache(CACHE_NAME);
@@ -403,7 +404,7 @@ public class IgnitePdsBinaryMetadataOnClusterRestartTest extends GridCommonAbstr
ignite0 = grid(0);
- ignite0.active(true);
+ ignite0.cluster().state(ClusterState.ACTIVE);
examineStaticMetadata(2);
@@ -465,7 +466,7 @@ public class IgnitePdsBinaryMetadataOnClusterRestartTest extends GridCommonAbstr
Ignite ignite0 = grid(0);
- ignite0.active(true);
+ ignite0.cluster().state(ClusterState.ACTIVE);
IgniteCache<Object, Object> cache0 = ignite0.cache(CACHE_NAME);
@@ -485,7 +486,7 @@ public class IgnitePdsBinaryMetadataOnClusterRestartTest extends GridCommonAbstr
ignite0 = grid(0);
- ignite0.active(true);
+ ignite0.cluster().state(ClusterState.ACTIVE);
examineDynamicMetadata(2, contentExaminer0, structureExaminer0);
@@ -508,7 +509,7 @@ public class IgnitePdsBinaryMetadataOnClusterRestartTest extends GridCommonAbstr
ignite0 = grid(0);
- ignite0.active(true);
+ ignite0.cluster().state(ClusterState.ACTIVE);
examineDynamicMetadata(2, contentExaminer0, contentExaminer1, structureExaminer1);
@@ -528,7 +529,7 @@ public class IgnitePdsBinaryMetadataOnClusterRestartTest extends GridCommonAbstr
public void testBinaryEnumMetadataIsRestoredOnRestart() throws Exception {
Ignite ignite0 = startGrids(2);
- ignite0.active(true);
+ ignite0.cluster().state(ClusterState.ACTIVE);
BinaryObject enumBo0 = ignite0.binary().buildEnum(EnumType.class.getName(), 0);
@@ -538,7 +539,7 @@ public class IgnitePdsBinaryMetadataOnClusterRestartTest extends GridCommonAbstr
ignite0 = startGrids(2);
- ignite0.active(true);
+ ignite0.cluster().state(ClusterState.ACTIVE);
startGrid(2);
@@ -550,7 +551,7 @@ public class IgnitePdsBinaryMetadataOnClusterRestartTest extends GridCommonAbstr
ignite0 = startGrids(3);
- ignite0.active(true);
+ ignite0.cluster().state(ClusterState.ACTIVE);
startClientGrid(3);
@@ -569,7 +570,7 @@ public class IgnitePdsBinaryMetadataOnClusterRestartTest extends GridCommonAbstr
// Examines all objects in cache (field values and metadata).
Ignite ignite0 = startGrid(0);
- ignite0.active(true);
+ ignite0.cluster().state(ClusterState.ACTIVE);
IgniteCache cache0 = ignite0.cache(CACHE_NAME);
@@ -606,7 +607,7 @@ public class IgnitePdsBinaryMetadataOnClusterRestartTest extends GridCommonAbstr
startGrids(4);
- grid(0).active(true);
+ grid(0).cluster().state(ClusterState.ACTIVE);
examineStaticMetadata(4);
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsBinarySortObjectFieldsTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsBinarySortObjectFieldsTest.java
index bccad9dc038..b3d2e60a4cf 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsBinarySortObjectFieldsTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsBinarySortObjectFieldsTest.java
@@ -21,6 +21,7 @@ import java.util.concurrent.TimeUnit;
import org.apache.ignite.IgniteCache;
import org.apache.ignite.IgniteSystemProperties;
import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.DataRegionConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
@@ -81,7 +82,7 @@ public class IgnitePdsBinarySortObjectFieldsTest extends GridCommonAbstractTest
public void testGivenCacheWithPojoValueAndPds_WhenPut_ThenNoHangup() throws Exception {
IgniteEx ignite = startGrid(0);
- ignite.cluster().active(true);
+ ignite.cluster().state(ClusterState.ACTIVE);
final IgniteCache<Long, Value> cache = ignite.getOrCreateCache(
new CacheConfiguration<Long, Value>(CACHE_NAME)
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsCacheConfigurationFileConsistencyCheckTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsCacheConfigurationFileConsistencyCheckTest.java
index 05d858088ac..8bd1ea1ccee 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsCacheConfigurationFileConsistencyCheckTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsCacheConfigurationFileConsistencyCheckTest.java
@@ -28,6 +28,7 @@ import java.util.List;
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.DataRegionConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
@@ -100,7 +101,7 @@ public class IgnitePdsCacheConfigurationFileConsistencyCheckTest extends GridCom
public void testStartDuplicatedCacheConfigurations() throws Exception {
IgniteEx ig0 = (IgniteEx)startGrids(NODES);
- ig0.cluster().active(true);
+ ig0.cluster().state(ClusterState.ACTIVE);
startCaches(ig0);
@@ -128,7 +129,7 @@ public class IgnitePdsCacheConfigurationFileConsistencyCheckTest extends GridCom
public void testTmpCacheConfigurationsDelete() throws Exception {
IgniteEx ig0 = (IgniteEx)startGrids(NODES);
- ig0.cluster().active(true);
+ ig0.cluster().state(ClusterState.ACTIVE);
startCaches(ig0);
@@ -168,7 +169,7 @@ public class IgnitePdsCacheConfigurationFileConsistencyCheckTest extends GridCom
public void testCorruptedCacheConfigurationsValidation() throws Exception {
IgniteEx ig0 = (IgniteEx)startGrids(NODES);
- ig0.cluster().active(true);
+ ig0.cluster().state(ClusterState.ACTIVE);
startCaches(ig0);
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsCacheEntriesExpirationTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsCacheEntriesExpirationTest.java
index 986c680452c..d1437d4fba3 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsCacheEntriesExpirationTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsCacheEntriesExpirationTest.java
@@ -27,6 +27,7 @@ import org.apache.ignite.IgniteCache;
import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.CacheWriteSynchronizationMode;
import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.DataRegionConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
@@ -128,7 +129,7 @@ public class IgnitePdsCacheEntriesExpirationTest extends GridCommonAbstractTest
IgniteEx srv0 = startGrids(2);
- srv0.cluster().active(true);
+ srv0.cluster().state(ClusterState.ACTIVE);
awaitPartitionMapExchange();
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsCacheObjectBinaryProcessorOnDiscoveryTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsCacheObjectBinaryProcessorOnDiscoveryTest.java
index d0a5822f572..2af1ffae90c 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsCacheObjectBinaryProcessorOnDiscoveryTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsCacheObjectBinaryProcessorOnDiscoveryTest.java
@@ -21,6 +21,7 @@ import java.util.Arrays;
import org.apache.ignite.Ignite;
import org.apache.ignite.binary.BinaryObject;
import org.apache.ignite.binary.BinaryObjectBuilder;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.DataRegionConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
@@ -68,7 +69,7 @@ public class IgnitePdsCacheObjectBinaryProcessorOnDiscoveryTest extends GridComm
public void testJoiningNodeBinaryMetaOnClient() throws Exception {
IgniteEx ig0 = (IgniteEx)startGrids(2);
- ig0.cluster().active(true);
+ ig0.cluster().state(ClusterState.ACTIVE);
addBinaryType(ig0, "test_1", new IgniteBiTuple<>("name", String.class));
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsCacheRebalancingAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsCacheRebalancingAbstractTest.java
index 9f898d0e584..e64cef91869 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsCacheRebalancingAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsCacheRebalancingAbstractTest.java
@@ -47,6 +47,7 @@ import org.apache.ignite.cache.QueryIndex;
import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction;
import org.apache.ignite.cache.query.ScanQuery;
import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.DataRegionConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
@@ -232,7 +233,7 @@ public abstract class IgnitePdsCacheRebalancingAbstractTest extends GridCommonAb
IgniteEx ignite2 = startGrid(2);
- ignite0.cluster().active(true);
+ ignite0.cluster().state(ClusterState.ACTIVE);
awaitPartitionMapExchange();
@@ -285,7 +286,7 @@ public abstract class IgnitePdsCacheRebalancingAbstractTest extends GridCommonAb
IgniteEx ignite2 = startGrid(2);
IgniteEx ignite3 = startGrid(3);
- ignite0.cluster().active(true);
+ ignite0.cluster().state(ClusterState.ACTIVE);
awaitPartitionMapExchange();
@@ -355,7 +356,7 @@ public abstract class IgnitePdsCacheRebalancingAbstractTest extends GridCommonAb
Ignite ignite = startGridsMultiThreaded(4);
- ignite.cluster().active(true);
+ ignite.cluster().state(ClusterState.ACTIVE);
try (IgniteDataStreamer<Integer, TestValue> ds = ignite.dataStreamer(INDEXED_CACHE)) {
for (int i = 0; i < entriesCnt; i++) {
@@ -563,7 +564,7 @@ public abstract class IgnitePdsCacheRebalancingAbstractTest extends GridCommonAb
final Ignite ig = grid(1);
- ig.cluster().active(true);
+ ig.cluster().state(ClusterState.ACTIVE);
awaitPartitionMapExchange();
@@ -603,7 +604,7 @@ public abstract class IgnitePdsCacheRebalancingAbstractTest extends GridCommonAb
public void testPartitionCounterConsistencyOnUnstableTopology() throws Exception {
Ignite ig = startGridsMultiThreaded(4);
- ig.cluster().active(true);
+ ig.cluster().state(ClusterState.ACTIVE);
int keys = 0;
@@ -694,7 +695,7 @@ public abstract class IgnitePdsCacheRebalancingAbstractTest extends GridCommonAb
Ignite ignite0 = startGrids(2);
- ignite0.cluster().active(true);
+ ignite0.cluster().state(ClusterState.ACTIVE);
IgniteCache<Integer, TestValue> cachePds = ignite0.cache(INDEXED_CACHE);
IgniteCache<Integer, TestValue> cacheInMem = ignite0.cache(INDEXED_CACHE_IN_MEMORY);
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsCacheStartStopWithFreqCheckpointTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsCacheStartStopWithFreqCheckpointTest.java
index 36096c7374f..b6c77577ed3 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsCacheStartStopWithFreqCheckpointTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsCacheStartStopWithFreqCheckpointTest.java
@@ -27,6 +27,7 @@ import org.apache.ignite.IgniteException;
import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.cache.CacheRebalanceMode;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.DataRegionConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
@@ -118,7 +119,7 @@ public class IgnitePdsCacheStartStopWithFreqCheckpointTest extends GridCommonAbs
public void testCheckpointDeadlock() throws Exception {
IgniteEx crd = startGrid(0);
- crd.cluster().active(true);
+ crd.cluster().state(ClusterState.ACTIVE);
for (int cacheId = 0; cacheId < CACHES; cacheId++) {
IgniteCache<Object, Object> cache = crd.getOrCreateCache(CACHE_NAME + cacheId);
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsConsistencyOnDelayedPartitionOwning.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsConsistencyOnDelayedPartitionOwning.java
index 67bb330de84..8e6c559db25 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsConsistencyOnDelayedPartitionOwning.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsConsistencyOnDelayedPartitionOwning.java
@@ -25,6 +25,7 @@ import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.CacheWriteSynchronizationMode;
import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction;
import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.DataRegionConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
@@ -113,7 +114,7 @@ public class IgnitePdsConsistencyOnDelayedPartitionOwning extends GridCommonAbst
@Test
public void checkConsistencyNodeLeft() throws Exception {
IgniteEx crd = (IgniteEx)startGridsMultiThreaded(4);
- crd.cluster().active(true);
+ crd.cluster().state(ClusterState.ACTIVE);
for (int i = 0; i < PARTS; i++)
crd.cache(DEFAULT_CACHE_NAME).put(i, i);
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsContinuousRestartTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsContinuousRestartTest.java
index e895d1081bb..5d521574703 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsContinuousRestartTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsContinuousRestartTest.java
@@ -31,6 +31,7 @@ import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.CacheWriteSynchronizationMode;
import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction;
import org.apache.ignite.cache.query.annotations.QuerySqlField;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.cluster.ClusterTopologyException;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.DataRegionConfiguration;
@@ -268,7 +269,7 @@ public class IgnitePdsContinuousRestartTest extends GridCommonAbstractTest {
final IgniteEx load = ignite(0);
- load.cluster().active(true);
+ load.cluster().state(ClusterState.ACTIVE);
try (IgniteDataStreamer<Object, Object> s = load.dataStreamer(CACHE_NAME)) {
s.allowOverwrite(true);
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsCorruptedIndexTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsCorruptedIndexTest.java
index f8dd4bd0e68..31d23a201a5 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsCorruptedIndexTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsCorruptedIndexTest.java
@@ -33,6 +33,7 @@ import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction;
import org.apache.ignite.cache.query.QueryCursor;
import org.apache.ignite.cache.query.SqlQuery;
import org.apache.ignite.cache.query.annotations.QuerySqlField;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.DataRegionConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
@@ -145,7 +146,7 @@ public class IgnitePdsCorruptedIndexTest extends GridCommonAbstractTest {
startGrid(2);
- ignite.cluster().active(true);
+ ignite.cluster().state(ClusterState.ACTIVE);
awaitPartitionMapExchange();
@@ -177,7 +178,7 @@ public class IgnitePdsCorruptedIndexTest extends GridCommonAbstractTest {
corruptedNode = (IgniteEx)startGrid(corruptedNodeName);
- corruptedNode.cluster().active(true);
+ corruptedNode.cluster().state(ClusterState.ACTIVE);
// Not all owners have been returned, data loss is expected.
assertFalse(grid(0).cache(CACHE).lostPartitions().isEmpty());
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsCorruptedStoreTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsCorruptedStoreTest.java
index f4fc049a36e..265e62de5f8 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsCorruptedStoreTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsCorruptedStoreTest.java
@@ -32,6 +32,7 @@ import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.CacheRebalanceMode;
import org.apache.ignite.cache.CacheWriteSynchronizationMode;
import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.ConnectorConfiguration;
import org.apache.ignite.configuration.DataRegionConfiguration;
@@ -164,9 +165,9 @@ public class IgnitePdsCorruptedStoreTest extends GridCommonAbstractTest {
IgniteEx ignite = startGrid(0);
- ignite.cluster().active(true);
+ ignite.cluster().state(ClusterState.ACTIVE);
- ignite.cluster().active(false);
+ ignite.cluster().state(ClusterState.INACTIVE);
stopGrid(0);
@@ -180,7 +181,7 @@ public class IgnitePdsCorruptedStoreTest extends GridCommonAbstractTest {
try {
startGrid(0);
- ignite.cluster().active(true);
+ ignite.cluster().state(ClusterState.ACTIVE);
}
catch (Exception e) {
// No-op.
@@ -196,7 +197,7 @@ public class IgnitePdsCorruptedStoreTest extends GridCommonAbstractTest {
public void testMetaStorageCorruption() throws Exception {
IgniteEx ignite = startGrid(0);
- ignite.cluster().active(true);
+ ignite.cluster().state(ClusterState.ACTIVE);
MetaStorage metaStorage = ignite.context().cache().context().database().metaStorage();
@@ -208,7 +209,7 @@ public class IgnitePdsCorruptedStoreTest extends GridCommonAbstractTest {
try {
startGrid(0);
- ignite.cluster().active(true);
+ ignite.cluster().state(ClusterState.ACTIVE);
}
catch (Exception e) {
// No-op.
@@ -224,7 +225,7 @@ public class IgnitePdsCorruptedStoreTest extends GridCommonAbstractTest {
public void testCacheMetaCorruption() throws Exception {
IgniteEx ignite = startGrid(0);
- ignite.cluster().active(true);
+ ignite.cluster().state(ClusterState.ACTIVE);
IgniteInternalCache cache = ignite.cachex(CACHE_NAME1);
@@ -236,14 +237,14 @@ public class IgnitePdsCorruptedStoreTest extends GridCommonAbstractTest {
corruptTreeRoot(ignite, (PageMemoryEx)cache.context().dataRegion().pageMemory(), grpId, partId);
- ignite.cluster().active(false);
+ ignite.cluster().state(ClusterState.INACTIVE);
stopGrid(0);
try {
startGrid(0);
- ignite.cluster().active(true);
+ ignite.cluster().state(ClusterState.ACTIVE);
cache.put(1, 1);
}
@@ -308,13 +309,13 @@ public class IgnitePdsCorruptedStoreTest extends GridCommonAbstractTest {
return null;
});
- ignite0.cluster().active(true);
+ ignite0.cluster().state(ClusterState.ACTIVE);
IgniteInternalCache<Integer, Integer> cache = ignite0.cachex(CACHE_NAME1);
cache.put(1, 1);
- ignite0.cluster().active(false);
+ ignite0.cluster().state(ClusterState.INACTIVE);
FilePageStoreManager storeMgr = ((FilePageStoreManager)ignite0.context().cache().context().pageStore());
@@ -327,7 +328,7 @@ public class IgnitePdsCorruptedStoreTest extends GridCommonAbstractTest {
IgniteInternalFuture fut = GridTestUtils.runAsync(new Runnable() {
@Override public void run() {
try {
- ignite0.cluster().active(true);
+ ignite0.cluster().state(ClusterState.ACTIVE);
}
catch (Exception ignore) {
// No-op.
@@ -347,7 +348,7 @@ public class IgnitePdsCorruptedStoreTest extends GridCommonAbstractTest {
public void testCheckpointFailure() throws Exception {
IgniteEx ignite = startGrid(0);
- ignite.cluster().active(true);
+ ignite.cluster().state(ClusterState.ACTIVE);
forceCheckpoint(); // Trigger empty checkpoint to make sure initial checkpoint on node start will finish.
@@ -409,7 +410,7 @@ public class IgnitePdsCorruptedStoreTest extends GridCommonAbstractTest {
public void testWalFsyncWriteHeaderFailure() throws Exception {
IgniteEx ignite = startGrid(0);
- ignite.cluster().active(true);
+ ignite.cluster().state(ClusterState.ACTIVE);
ignite.cache(CACHE_NAME1).put(0, 0);
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsDestroyCacheAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsDestroyCacheAbstractTest.java
index 55e1f02e139..f781e34ac40 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsDestroyCacheAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsDestroyCacheAbstractTest.java
@@ -25,6 +25,7 @@ import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCache;
import org.apache.ignite.IgniteDataStreamer;
import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.DataRegionConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
@@ -118,7 +119,7 @@ public abstract class IgnitePdsDestroyCacheAbstractTest extends GridCommonAbstra
ignite = startGrids(NODES);
- ignite.cluster().active(true);
+ ignite.cluster().state(ClusterState.ACTIVE);
log.warning("Grid started");
@@ -153,7 +154,7 @@ public abstract class IgnitePdsDestroyCacheAbstractTest extends GridCommonAbstra
ignite = startGrids(NODES);
- ignite.cluster().active(true);
+ ignite.cluster().state(ClusterState.ACTIVE);
log.warning("Grid started");
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsDestroyCacheTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsDestroyCacheTest.java
index 8dbf1508f11..276570fd731 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsDestroyCacheTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsDestroyCacheTest.java
@@ -69,7 +69,7 @@ public class IgnitePdsDestroyCacheTest extends IgnitePdsDestroyCacheAbstractTest
public void testDestroyCaches() throws Exception {
Ignite ignite = startGrids(NODES);
- ignite.cluster().active(true);
+ ignite.cluster().state(ClusterState.ACTIVE);
startCachesDynamically(ignite);
@@ -85,7 +85,7 @@ public class IgnitePdsDestroyCacheTest extends IgnitePdsDestroyCacheAbstractTest
public void testDestroyGroupCaches() throws Exception {
Ignite ignite = startGrids(NODES);
- ignite.cluster().active(true);
+ ignite.cluster().state(ClusterState.ACTIVE);
startGroupCachesDynamically(ignite);
@@ -102,7 +102,7 @@ public class IgnitePdsDestroyCacheTest extends IgnitePdsDestroyCacheAbstractTest
public void testDestroyCachesAbruptly() throws Exception {
Ignite ignite = startGrids(NODES);
- ignite.cluster().active(true);
+ ignite.cluster().state(ClusterState.ACTIVE);
startCachesDynamically(ignite);
@@ -119,7 +119,7 @@ public class IgnitePdsDestroyCacheTest extends IgnitePdsDestroyCacheAbstractTest
public void testDestroyGroupCachesAbruptly() throws Exception {
Ignite ignite = startGrids(NODES);
- ignite.cluster().active(true);
+ ignite.cluster().state(ClusterState.ACTIVE);
startGroupCachesDynamically(ignite);
@@ -140,7 +140,7 @@ public class IgnitePdsDestroyCacheTest extends IgnitePdsDestroyCacheAbstractTest
private void doTestDestroyCacheOperationNotBlockingCheckpointTest() throws Exception {
final IgniteEx ignite = startGrids(1);
- ignite.cluster().active(true);
+ ignite.cluster().state(ClusterState.ACTIVE);
startGroupCachesDynamically(ignite);
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsDestroyCacheWithoutCheckpointsTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsDestroyCacheWithoutCheckpointsTest.java
index 5119af88e0a..96a3b50fff7 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsDestroyCacheWithoutCheckpointsTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsDestroyCacheWithoutCheckpointsTest.java
@@ -19,6 +19,7 @@ package org.apache.ignite.internal.processors.cache.persistence;
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.internal.IgniteEx;
import org.apache.ignite.internal.util.typedef.G;
import org.junit.Test;
@@ -44,7 +45,7 @@ public class IgnitePdsDestroyCacheWithoutCheckpointsTest extends IgnitePdsDestro
public void testDestroyCachesAbruptlyWithoutCheckpoints() throws Exception {
Ignite ignite = startGrids(NODES);
- ignite.cluster().active(true);
+ ignite.cluster().state(ClusterState.ACTIVE);
startCachesDynamically(ignite);
@@ -62,7 +63,7 @@ public class IgnitePdsDestroyCacheWithoutCheckpointsTest extends IgnitePdsDestro
public void testDestroyGroupCachesAbruptlyWithoutCheckpoints() throws Exception {
Ignite ignite = startGrids(NODES);
- ignite.cluster().active(true);
+ ignite.cluster().state(ClusterState.ACTIVE);
startGroupCachesDynamically(ignite);
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsDiscoDataHandlingInNewClusterTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsDiscoDataHandlingInNewClusterTest.java
index f5ce76d3720..2661eca7b7d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsDiscoDataHandlingInNewClusterTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsDiscoDataHandlingInNewClusterTest.java
@@ -23,6 +23,7 @@ import org.apache.ignite.IgniteSystemProperties;
import org.apache.ignite.cache.affinity.AffinityFunction;
import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction;
import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.DataRegionConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
@@ -134,7 +135,7 @@ public class IgnitePdsDiscoDataHandlingInNewClusterTest extends GridCommonAbstra
startGrid(NODE_CONS_ID_1);
- ig0.cluster().active(true);
+ ig0.cluster().state(ClusterState.ACTIVE);
startDynamicCache(ig0, DYNAMIC_CACHE_NAME_0, MIXED_CACHES_GROUP_NAME_0);
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsDynamicCacheTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsDynamicCacheTest.java
index 78f2015d498..eb3ed130cb1 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsDynamicCacheTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsDynamicCacheTest.java
@@ -25,6 +25,7 @@ import org.apache.ignite.cache.CacheRebalanceMode;
import org.apache.ignite.cache.CacheWriteSynchronizationMode;
import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction;
import org.apache.ignite.cache.query.annotations.QuerySqlField;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.DataRegionConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
@@ -86,7 +87,7 @@ public class IgnitePdsDynamicCacheTest extends IgniteDbDynamicCacheSelfTest {
Ignite ignite = ignite(0);
- ignite.active(true);
+ ignite.cluster().state(ClusterState.ACTIVE);
CacheConfiguration ccfg1 = new CacheConfiguration();
@@ -129,7 +130,7 @@ public class IgnitePdsDynamicCacheTest extends IgniteDbDynamicCacheSelfTest {
ignite = ignite(0);
- ignite.active(true);
+ ignite.cluster().state(ClusterState.ACTIVE);
ignite.getOrCreateCache(ccfg1);
@@ -150,7 +151,7 @@ public class IgnitePdsDynamicCacheTest extends IgniteDbDynamicCacheSelfTest {
public void testDynamicCacheSavingOnNewNode() throws Exception {
Ignite ignite = startGrid(0);
- ignite.active(true);
+ ignite.cluster().state(ClusterState.ACTIVE);
CacheConfiguration ccfg = new CacheConfiguration(DEFAULT_CACHE_NAME);
@@ -178,7 +179,7 @@ public class IgnitePdsDynamicCacheTest extends IgniteDbDynamicCacheSelfTest {
startGrid(0);
ignite = startGrid(1);
- ignite.active(true);
+ ignite.cluster().state(ClusterState.ACTIVE);
cache = ignite.cache(DEFAULT_CACHE_NAME);
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsExchangeDuringCheckpointTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsExchangeDuringCheckpointTest.java
index 08505deab18..30bb164d016 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsExchangeDuringCheckpointTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsExchangeDuringCheckpointTest.java
@@ -18,6 +18,7 @@
package org.apache.ignite.internal.processors.cache.persistence;
import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.DataRegionConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
@@ -43,7 +44,7 @@ public class IgnitePdsExchangeDuringCheckpointTest extends GridCommonAbstractTes
for (int i = 0; i < SF.applyLB(5, 2); i++) {
startGrids(3);
IgniteEx ignite = grid(1);
- ignite.active(true);
+ ignite.cluster().state(ClusterState.ACTIVE);
awaitPartitionMapExchange();
@@ -65,7 +66,7 @@ public class IgnitePdsExchangeDuringCheckpointTest extends GridCommonAbstractTes
for (int i = 0; i < SF.applyLB(5, 2); i++) {
startGrids(2);
IgniteEx ignite = grid(1);
- ignite.active(true);
+ ignite.cluster().state(ClusterState.ACTIVE);
awaitPartitionMapExchange();
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsMarshallerMappingRestoreOnNodeStartTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsMarshallerMappingRestoreOnNodeStartTest.java
index 09fc575a5a4..019d8902d3b 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsMarshallerMappingRestoreOnNodeStartTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsMarshallerMappingRestoreOnNodeStartTest.java
@@ -22,6 +22,7 @@ import org.apache.ignite.IgniteCache;
import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.cache.CacheWriteSynchronizationMode;
import org.apache.ignite.cache.affinity.AffinityKeyMapped;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
@@ -75,7 +76,7 @@ public class IgnitePdsMarshallerMappingRestoreOnNodeStartTest extends GridCommon
Ignite ignite0 = grid(0);
- ignite0.active(true);
+ ignite0.cluster().state(ClusterState.ACTIVE);
IgniteCache<Object, Object> cache0 = ignite0.cache(DEFAULT_CACHE_NAME);
@@ -87,7 +88,7 @@ public class IgnitePdsMarshallerMappingRestoreOnNodeStartTest extends GridCommon
ignite0 = grid(0);
- ignite0.active(true);
+ ignite0.cluster().state(ClusterState.ACTIVE);
Ignite ignite1 = startGrid(1);
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsNoSpaceLeftOnDeviceTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsNoSpaceLeftOnDeviceTest.java
index 866cf221fb0..91dbade7f4a 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsNoSpaceLeftOnDeviceTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsNoSpaceLeftOnDeviceTest.java
@@ -23,6 +23,7 @@ import java.nio.file.OpenOption;
import java.util.concurrent.atomic.AtomicReference;
import org.apache.ignite.IgniteCache;
import org.apache.ignite.cache.CacheAtomicityMode;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
@@ -89,7 +90,7 @@ public class IgnitePdsNoSpaceLeftOnDeviceTest extends GridCommonAbstractTest {
FailingFileIOFactory.setUnluckyConsistentId(ignite1.localNode().consistentId().toString());
- ignite0.cluster().active(true);
+ ignite0.cluster().state(ClusterState.ACTIVE);
final IgniteCache cache = ignite0.cache(DEFAULT_CACHE_NAME);
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsPageSizesTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsPageSizesTest.java
index d8750cf61bc..25e5de6cf83 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsPageSizesTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsPageSizesTest.java
@@ -23,6 +23,7 @@ import java.util.concurrent.ThreadLocalRandom;
import org.apache.ignite.IgniteCache;
import org.apache.ignite.IgniteSystemProperties;
import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.DataRegionConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
@@ -130,7 +131,7 @@ public class IgnitePdsPageSizesTest extends GridCommonAbstractTest {
IgniteEx ignite = startGrid(0);
- ignite.active(true);
+ ignite.cluster().state(ClusterState.ACTIVE);
try {
final IgniteCache<Object, Object> cache = ignite.cache(cacheName);
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsPartitionFilesDestroyTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsPartitionFilesDestroyTest.java
index 07b0ab40f55..4beaabdcbac 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsPartitionFilesDestroyTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsPartitionFilesDestroyTest.java
@@ -26,6 +26,7 @@ import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.IgniteDataStreamer;
import org.apache.ignite.cache.CacheWriteSynchronizationMode;
import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.DataRegionConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
@@ -149,7 +150,7 @@ public class IgnitePdsPartitionFilesDestroyTest extends GridCommonAbstractTest {
IgniteEx crd = (IgniteEx)startGrids(2);
crd.cluster().baselineAutoAdjustEnabled(false);
- crd.cluster().active(true);
+ crd.cluster().state(ClusterState.ACTIVE);
int keysCnt = 50_000;
@@ -186,7 +187,7 @@ public class IgnitePdsPartitionFilesDestroyTest extends GridCommonAbstractTest {
IgniteEx node = startGrid(1);
- crd.cluster().active(true);
+ crd.cluster().state(ClusterState.ACTIVE);
int keysCnt = 50_000;
@@ -240,7 +241,7 @@ public class IgnitePdsPartitionFilesDestroyTest extends GridCommonAbstractTest {
failFileIo = false;
- crd.cluster().active(true);
+ crd.cluster().state(ClusterState.ACTIVE);
int keysCnt = 50_000;
@@ -300,7 +301,7 @@ public class IgnitePdsPartitionFilesDestroyTest extends GridCommonAbstractTest {
failFileIo = false;
- crd.cluster().active(true);
+ crd.cluster().state(ClusterState.ACTIVE);
int keysCnt = 50_000;
@@ -360,7 +361,7 @@ public class IgnitePdsPartitionFilesDestroyTest extends GridCommonAbstractTest {
public void testDestroyWhenPartitionsAreEmpty() throws Exception {
IgniteEx crd = (IgniteEx)startGrids(2);
- crd.cluster().active(true);
+ crd.cluster().state(ClusterState.ACTIVE);
forceCheckpoint();
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsPartitionsStateRecoveryTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsPartitionsStateRecoveryTest.java
index 40c8a985c7d..8bf714f9537 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsPartitionsStateRecoveryTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsPartitionsStateRecoveryTest.java
@@ -22,6 +22,7 @@ import org.apache.ignite.IgniteCache;
import org.apache.ignite.cache.CacheRebalanceMode;
import org.apache.ignite.cache.CacheWriteSynchronizationMode;
import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.DataRegionConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
@@ -103,7 +104,7 @@ public class IgnitePdsPartitionsStateRecoveryTest extends GridCommonAbstractTest
public void testPartitionsStateConsistencyAfterRecovery() throws Exception {
IgniteEx ignite = startGrid(0);
- ignite.cluster().active(true);
+ ignite.cluster().state(ClusterState.ACTIVE);
IgniteCache<Object, Object> cache = ignite.cache(DEFAULT_CACHE_NAME);
@@ -147,7 +148,7 @@ public class IgnitePdsPartitionsStateRecoveryTest extends GridCommonAbstractTest
IgniteEx ignite = startGrid(0);
- ignite.cluster().active(true);
+ ignite.cluster().state(ClusterState.ACTIVE);
IgniteCache<Object, Object> cache = ignite.cache(DEFAULT_CACHE_NAME);
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsRemoveDuringRebalancingTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsRemoveDuringRebalancingTest.java
index 12a8ff1afc9..b536f136081 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsRemoveDuringRebalancingTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsRemoveDuringRebalancingTest.java
@@ -24,6 +24,7 @@ import org.apache.ignite.IgniteDataStreamer;
import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.CacheRebalanceMode;
import org.apache.ignite.cache.CacheWriteSynchronizationMode;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.DataRegionConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
@@ -93,7 +94,7 @@ public class IgnitePdsRemoveDuringRebalancingTest extends GridCommonAbstractTest
public void testRemovesDuringRebalancing() throws Exception {
IgniteEx ig = startGrid(0);
- ig.active(true);
+ ig.cluster().state(ClusterState.ACTIVE);
try (IgniteDataStreamer<Object, Object> streamer = ig.dataStreamer(DEFAULT_CACHE_NAME)) {
streamer.allowOverwrite(true);
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsRestartAfterFailedToWriteMetaPageTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsRestartAfterFailedToWriteMetaPageTest.java
index 6dabad93838..8ad6295d242 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsRestartAfterFailedToWriteMetaPageTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsRestartAfterFailedToWriteMetaPageTest.java
@@ -27,6 +27,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
import org.apache.ignite.IgniteCache;
import org.apache.ignite.cache.CacheMode;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.DataRegionConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
@@ -101,7 +102,7 @@ public class IgnitePdsRestartAfterFailedToWriteMetaPageTest extends GridCommonAb
startGrid(1);
- grid.cluster().active(true);
+ grid.cluster().state(ClusterState.ACTIVE);
AtomicBoolean stop = new AtomicBoolean();
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsSporadicDataRecordsOnBackupTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsSporadicDataRecordsOnBackupTest.java
index 96899adc2f0..18b2dbd8b4b 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsSporadicDataRecordsOnBackupTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsSporadicDataRecordsOnBackupTest.java
@@ -27,6 +27,7 @@ import org.apache.ignite.IgniteCache;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.cache.QueryEntity;
import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.DataRegionConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
@@ -116,7 +117,7 @@ public class IgnitePdsSporadicDataRecordsOnBackupTest extends GridCommonAbstract
IgniteEx ig0 = startGrid(0);
IgniteEx ig1 = startGrid(1);
- grid(0).cluster().active(true);
+ grid(0).cluster().state(ClusterState.ACTIVE);
String nodeFolderName0 = ig0.context().pdsFolderResolver().resolveFolders().folderName();
String nodeFolderName1 = ig1.context().pdsFolderResolver().resolveFolders().folderName();
@@ -134,7 +135,7 @@ public class IgnitePdsSporadicDataRecordsOnBackupTest extends GridCommonAbstract
txLoadFut.get();
- grid(0).cluster().active(false);
+ grid(0).cluster().state(ClusterState.INACTIVE);
stopAllGrids();
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsSpuriousRebalancingOnNodeJoinTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsSpuriousRebalancingOnNodeJoinTest.java
index c7df9186058..dcca834d74c 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsSpuriousRebalancingOnNodeJoinTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsSpuriousRebalancingOnNodeJoinTest.java
@@ -22,6 +22,7 @@ import java.util.List;
import java.util.concurrent.atomic.AtomicLong;
import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction;
import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.DataRegionConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
@@ -98,7 +99,7 @@ public class IgnitePdsSpuriousRebalancingOnNodeJoinTest extends GridCommonAbstra
try {
IgniteEx crd = startGrids(2);
- crd.cluster().active(true);
+ crd.cluster().state(ClusterState.ACTIVE);
crd.cluster().baselineAutoAdjustEnabled(false);
List<Integer> moving = movingKeysAfterJoin(crd, DEFAULT_CACHE_NAME, 10);
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsTaskCancelingTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsTaskCancelingTest.java
index a76282126b4..39263752079 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsTaskCancelingTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsTaskCancelingTest.java
@@ -30,6 +30,7 @@ import java.util.concurrent.locks.LockSupport;
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCountDownLatch;
import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.DataRegionConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
@@ -123,7 +124,7 @@ public class IgnitePdsTaskCancelingTest extends GridCommonAbstractTest {
try {
Ignite ig0 = startGrids(4);
- ig0.cluster().active(true);
+ ig0.cluster().state(ClusterState.ACTIVE);
Collection<IgniteFuture> cancelFutures = new ArrayList<>(NUM_TASKS);
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePersistentStoreCacheGroupsTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePersistentStoreCacheGroupsTest.java
index 5bd211c2520..e08dcbb476f 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePersistentStoreCacheGroupsTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePersistentStoreCacheGroupsTest.java
@@ -33,6 +33,7 @@ import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.cache.query.SqlQuery;
import org.apache.ignite.cache.query.annotations.QuerySqlField;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.BinaryConfiguration;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.DataRegionConfiguration;
@@ -174,7 +175,7 @@ public class IgnitePersistentStoreCacheGroupsTest extends GridCommonAbstractTest
Ignite node = ignite(0);
- node.active(true);
+ node.cluster().state(ClusterState.ACTIVE);
node.createCaches(Arrays.asList(ccfgs1));
@@ -189,7 +190,7 @@ public class IgnitePersistentStoreCacheGroupsTest extends GridCommonAbstractTest
node = ignite(0);
- node.active(true);
+ node.cluster().state(ClusterState.ACTIVE);
awaitPartitionMapExchange();
@@ -234,7 +235,7 @@ public class IgnitePersistentStoreCacheGroupsTest extends GridCommonAbstractTest
Ignite node = ignite(0);
- node.cluster().active(true);
+ node.cluster().state(ClusterState.ACTIVE);
node.createCaches(Arrays.asList(ccfgs1));
@@ -268,7 +269,7 @@ public class IgnitePersistentStoreCacheGroupsTest extends GridCommonAbstractTest
node = ignite(0);
- node.cluster().active(true);
+ node.cluster().state(ClusterState.ACTIVE);
for (String cacheName : caches) {
IgniteCache<Object, Object> cache = node.cache(cacheName);
@@ -297,7 +298,7 @@ public class IgnitePersistentStoreCacheGroupsTest extends GridCommonAbstractTest
Ignite ignite = startGrid();
- ignite.active(true);
+ ignite.cluster().state(ClusterState.ACTIVE);
ignite.cache("c1").destroy();
@@ -315,7 +316,7 @@ public class IgnitePersistentStoreCacheGroupsTest extends GridCommonAbstractTest
Ignite ignite = startGrid();
- ignite.active(true);
+ ignite.cluster().state(ClusterState.ACTIVE);
ignite.createCaches(Arrays.asList(ccfg1, ccfg2));
@@ -342,7 +343,7 @@ public class IgnitePersistentStoreCacheGroupsTest extends GridCommonAbstractTest
Ignite ignite = startGrid();
- ignite.active(true);
+ ignite.cluster().state(ClusterState.ACTIVE);
ignite.createCaches(Arrays.asList(ccfg1, ccfg2));
@@ -426,7 +427,7 @@ public class IgnitePersistentStoreCacheGroupsTest extends GridCommonAbstractTest
Ignite node = ignite(0);
- node.active(true);
+ node.cluster().state(ClusterState.ACTIVE);
if (!staticCaches)
node.createCaches(Arrays.asList(ccfgs));
@@ -447,7 +448,7 @@ public class IgnitePersistentStoreCacheGroupsTest extends GridCommonAbstractTest
node = startGrids(nodes);
- node.active(true);
+ node.cluster().state(ClusterState.ACTIVE);
awaitPartitionMapExchange();
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePersistentStoreDataStructuresTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePersistentStoreDataStructuresTest.java
index 4787031040f..a4348eec021 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePersistentStoreDataStructuresTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePersistentStoreDataStructuresTest.java
@@ -27,6 +27,7 @@ import org.apache.ignite.IgniteLock;
import org.apache.ignite.IgniteQueue;
import org.apache.ignite.IgniteSemaphore;
import org.apache.ignite.IgniteSet;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.CollectionConfiguration;
import org.apache.ignite.configuration.DataRegionConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
@@ -89,7 +90,7 @@ public class IgnitePersistentStoreDataStructuresTest extends GridCommonAbstractT
public void testQueue() throws Exception {
Ignite ignite = startGrids(4);
- ignite.active(true);
+ ignite.cluster().state(ClusterState.ACTIVE);
IgniteQueue<Object> queue = ignite.queue("testQueue", 100, new CollectionConfiguration());
@@ -100,7 +101,7 @@ public class IgnitePersistentStoreDataStructuresTest extends GridCommonAbstractT
ignite = startGrids(4);
- ignite.active(true);
+ ignite.cluster().state(ClusterState.ACTIVE);
queue = ignite.queue("testQueue", 0, null);
@@ -115,7 +116,7 @@ public class IgnitePersistentStoreDataStructuresTest extends GridCommonAbstractT
public void testAtomic() throws Exception {
Ignite ignite = startGrids(4);
- ignite.active(true);
+ ignite.cluster().state(ClusterState.ACTIVE);
IgniteAtomicLong atomicLong = ignite.atomicLong("testLong", 0, true);
@@ -126,7 +127,7 @@ public class IgnitePersistentStoreDataStructuresTest extends GridCommonAbstractT
ignite = startGrids(4);
- ignite.active(true);
+ ignite.cluster().state(ClusterState.ACTIVE);
atomicLong = ignite.atomicLong("testLong", 0, false);
@@ -141,7 +142,7 @@ public class IgnitePersistentStoreDataStructuresTest extends GridCommonAbstractT
public void testSequence() throws Exception {
Ignite ignite = startGrids(4);
- ignite.active(true);
+ ignite.cluster().state(ClusterState.ACTIVE);
IgniteAtomicSequence sequence = ignite.atomicSequence("testSequence", 0, true);
@@ -157,7 +158,7 @@ public class IgnitePersistentStoreDataStructuresTest extends GridCommonAbstractT
ignite = startGrids(4);
- ignite.active(true);
+ ignite.cluster().state(ClusterState.ACTIVE);
sequence = ignite.atomicSequence("testSequence", 0, false);
@@ -175,7 +176,7 @@ public class IgnitePersistentStoreDataStructuresTest extends GridCommonAbstractT
Ignite ignite = startGrids(2);
- ignite.cluster().active(true);
+ ignite.cluster().state(ClusterState.ACTIVE);
ignite.atomicSequence(seqName, 0, true);
@@ -216,7 +217,7 @@ public class IgnitePersistentStoreDataStructuresTest extends GridCommonAbstractT
public void testSet() throws Exception {
Ignite ignite = startGrids(4);
- ignite.active(true);
+ ignite.cluster().state(ClusterState.ACTIVE);
IgniteSet<Object> set = ignite.set("testSet", new CollectionConfiguration());
@@ -229,7 +230,7 @@ public class IgnitePersistentStoreDataStructuresTest extends GridCommonAbstractT
ignite = startGrids(4);
- ignite.active(true);
+ ignite.cluster().state(ClusterState.ACTIVE);
set = ignite.set("testSet", null);
@@ -248,7 +249,7 @@ public class IgnitePersistentStoreDataStructuresTest extends GridCommonAbstractT
public void testLockVolatility() throws Exception {
Ignite ignite = startGrids(4);
- ignite.active(true);
+ ignite.cluster().state(ClusterState.ACTIVE);
IgniteLock lock = ignite.reentrantLock("test", false, true, true);
@@ -258,7 +259,7 @@ public class IgnitePersistentStoreDataStructuresTest extends GridCommonAbstractT
ignite = startGrids(4);
- ignite.active(true);
+ ignite.cluster().state(ClusterState.ACTIVE);
lock = ignite.reentrantLock("test", false, true, false);
@@ -272,7 +273,7 @@ public class IgnitePersistentStoreDataStructuresTest extends GridCommonAbstractT
public void testSemaphoreVolatility() throws Exception {
Ignite ignite = startGrids(4);
- ignite.active(true);
+ ignite.cluster().state(ClusterState.ACTIVE);
IgniteSemaphore sem = ignite.semaphore("test", 10, false, true);
@@ -282,7 +283,7 @@ public class IgnitePersistentStoreDataStructuresTest extends GridCommonAbstractT
ignite = startGrids(4);
- ignite.active(true);
+ ignite.cluster().state(ClusterState.ACTIVE);
sem = ignite.semaphore("test", 10, false, false);
@@ -296,7 +297,7 @@ public class IgnitePersistentStoreDataStructuresTest extends GridCommonAbstractT
public void testLatchVolatility() throws Exception {
Ignite ignite = startGrids(4);
- ignite.active(true);
+ ignite.cluster().state(ClusterState.ACTIVE);
IgniteCountDownLatch latch = ignite.countDownLatch("test", 10, false, true);
@@ -306,7 +307,7 @@ public class IgnitePersistentStoreDataStructuresTest extends GridCommonAbstractT
ignite = startGrids(4);
- ignite.active(true);
+ ignite.cluster().state(ClusterState.ACTIVE);
latch = ignite.countDownLatch("test", 10, false, false);
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgniteRebalanceScheduleResendPartitionsTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgniteRebalanceScheduleResendPartitionsTest.java
index 81be10a2f59..4ab047d747e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgniteRebalanceScheduleResendPartitionsTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgniteRebalanceScheduleResendPartitionsTest.java
@@ -30,6 +30,7 @@ import org.apache.ignite.IgniteLogger;
import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction;
import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.DataRegionConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
@@ -110,7 +111,7 @@ public class IgniteRebalanceScheduleResendPartitionsTest extends GridCommonAbstr
Ignite ig0 = startGrids(3);
ig0.cluster().baselineAutoAdjustEnabled(false);
- ig0.cluster().active(true);
+ ig0.cluster().state(ClusterState.ACTIVE);
int entries = 100_000;
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/SingleNodePersistenceSslTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/SingleNodePersistenceSslTest.java
index 118d57de9a4..42f7bd03393 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/SingleNodePersistenceSslTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/SingleNodePersistenceSslTest.java
@@ -17,6 +17,7 @@
package org.apache.ignite.internal.processors.cache.persistence;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.DataRegionConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
@@ -66,8 +67,8 @@ public class SingleNodePersistenceSslTest extends GridCommonAbstractTest {
*/
@Test
public void testActivate() throws Exception {
- startGrids(2).cluster().active(true);
+ startGrids(2).cluster().state(ClusterState.ACTIVE);
- assertTrue(grid(0).cluster().active());
+ assertTrue(grid(0).cluster().state().active());
}
}
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/WalPreloadingConcurrentTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/WalPreloadingConcurrentTest.java
index 2c88acc911c..89789d90b18 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/WalPreloadingConcurrentTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/WalPreloadingConcurrentTest.java
@@ -24,6 +24,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.cache.CacheRebalanceMode;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.DataRegionConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
@@ -95,7 +96,7 @@ public class WalPreloadingConcurrentTest extends GridCommonAbstractTest {
final int entryCnt = 3200;
- ig.cluster().active(true);
+ ig.cluster().state(ClusterState.ACTIVE);
IgniteInternalCache<Object, Object> cache = ig.cachex(DEFAULT_CACHE_NAME);
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/ClientAffinityAssignmentWithBaselineTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/ClientAffinityAssignmentWithBaselineTest.java
index 7ca4e9ff13c..f4e09c09b37 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/ClientAffinityAssignmentWithBaselineTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/ClientAffinityAssignmentWithBaselineTest.java
@@ -40,6 +40,7 @@ import org.apache.ignite.cache.CacheWriteSynchronizationMode;
import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction;
import org.apache.ignite.cluster.BaselineNode;
import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.cluster.ClusterTopologyException;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.DataRegionConfiguration;
@@ -282,14 +283,14 @@ public class ClientAffinityAssignmentWithBaselineTest extends GridCommonAbstract
client2 = startClientGrid("client2");
}
else
- ig0.cluster().active(true);
+ ig0.cluster().state(ClusterState.ACTIVE);
AtomicBoolean stopLoad = new AtomicBoolean(false);
AtomicReference<Throwable> loadError = new AtomicReference<>(null);
if (lateActivation)
- ig0.cluster().active(true);
+ ig0.cluster().state(ClusterState.ACTIVE);
IgniteCache<Integer, String> cache = ig0.cache(cacheName);
@@ -344,7 +345,7 @@ public class ClientAffinityAssignmentWithBaselineTest extends GridCommonAbstract
IgniteEx ig0 = (IgniteEx)startGrids(DEFAULT_NODES_COUNT - 1);
startGrid("flaky");
- ig0.cluster().active(true);
+ ig0.cluster().state(ClusterState.ACTIVE);
AtomicBoolean stopLoad = new AtomicBoolean(false);
@@ -411,7 +412,7 @@ public class ClientAffinityAssignmentWithBaselineTest extends GridCommonAbstract
IgniteEx ig0 = (IgniteEx)startGrids(DEFAULT_NODES_COUNT);
ig0.cluster().baselineAutoAdjustEnabled(false);
- ig0.cluster().active(true);
+ ig0.cluster().state(ClusterState.ACTIVE);
AtomicBoolean stopLoad = new AtomicBoolean(false);
@@ -473,7 +474,7 @@ public class ClientAffinityAssignmentWithBaselineTest extends GridCommonAbstract
public void testDynamicCacheLongTransactionNodeStart() throws Exception {
IgniteEx ig0 = (IgniteEx)startGrids(4);
- ig0.cluster().active(true);
+ ig0.cluster().state(ClusterState.ACTIVE);
IgniteEx client = startClientGrid("client");
@@ -546,7 +547,7 @@ public class ClientAffinityAssignmentWithBaselineTest extends GridCommonAbstract
public void testDynamicCacheStartNoAffinityNodes() throws Exception {
IgniteEx ig0 = startGrid(0);
- ig0.cluster().active(true);
+ ig0.cluster().state(ClusterState.ACTIVE);
IgniteEx client = startClientGrid("client");
@@ -627,7 +628,7 @@ public class ClientAffinityAssignmentWithBaselineTest extends GridCommonAbstract
public void testClientJoinCacheLongTransactionNodeStart() throws Exception {
IgniteEx ig0 = (IgniteEx)startGrids(4);
- ig0.cluster().active(true);
+ ig0.cluster().state(ClusterState.ACTIVE);
IgniteEx client = startClientGrid("client");
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteAbsentEvictionNodeOutOfBaselineTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteAbsentEvictionNodeOutOfBaselineTest.java
index 0db24aaaf4f..808d65084df 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteAbsentEvictionNodeOutOfBaselineTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteAbsentEvictionNodeOutOfBaselineTest.java
@@ -21,6 +21,7 @@ import java.util.Collections;
import java.util.List;
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCache;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.DataRegionConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
@@ -88,7 +89,7 @@ public class IgniteAbsentEvictionNodeOutOfBaselineTest extends GridCommonAbstrac
Ignite ignite0 = startGrids(3);
ignite0.cluster().baselineAutoAdjustEnabled(false);
- ignite0.cluster().active(true);
+ ignite0.cluster().state(ClusterState.ACTIVE);
IgniteCache<Object, Object> cache = ignite0.getOrCreateCache(TEST_CACHE_NAME);
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteAllBaselineNodesOnlineFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteAllBaselineNodesOnlineFullApiSelfTest.java
index 8365f8724b0..65e7be7c1c3 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteAllBaselineNodesOnlineFullApiSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteAllBaselineNodesOnlineFullApiSelfTest.java
@@ -16,6 +16,8 @@
*/
package org.apache.ignite.internal.processors.cache.persistence.baseline;
+import org.apache.ignite.cluster.ClusterState;
+
/**
* Full API cache tests when all online nodes in the cluster are in BaselineTopology.
*/
@@ -28,7 +30,7 @@ public class IgniteAllBaselineNodesOnlineFullApiSelfTest extends IgniteBaselineA
startGrids(gridCount());
- grid(0).active(true);
+ grid(0).cluster().state(ClusterState.ACTIVE);
awaitPartitionMapExchange();
}
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteChangingBaselineDownCachePutAllFailoverTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteChangingBaselineDownCachePutAllFailoverTest.java
index 3b89d312ddb..59c694f997b 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteChangingBaselineDownCachePutAllFailoverTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteChangingBaselineDownCachePutAllFailoverTest.java
@@ -23,6 +23,7 @@ import java.util.concurrent.ThreadLocalRandom;
import java.util.concurrent.atomic.AtomicBoolean;
import org.apache.ignite.cluster.BaselineNode;
import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.DataRegionConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
@@ -70,7 +71,7 @@ public class IgniteChangingBaselineDownCachePutAllFailoverTest extends CachePutA
startGrids(GRIDS_COUNT);
grid(0).cluster().baselineAutoAdjustEnabled(false);
- grid(0).active(true);
+ grid(0).cluster().state(ClusterState.ACTIVE);
awaitPartitionMapExchange();
}
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteChangingBaselineDownCacheRemoveFailoverTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteChangingBaselineDownCacheRemoveFailoverTest.java
index cdb2b80d4ee..90053e831f4 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteChangingBaselineDownCacheRemoveFailoverTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteChangingBaselineDownCacheRemoveFailoverTest.java
@@ -27,6 +27,7 @@ import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.cluster.BaselineNode;
import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.DataRegionConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
@@ -94,7 +95,7 @@ public class IgniteChangingBaselineDownCacheRemoveFailoverTest extends GridCache
startGrid(GRIDS_COUNT);
grid(0).cluster().baselineAutoAdjustEnabled(false);
- grid(0).active(true);
+ grid(0).cluster().state(ClusterState.ACTIVE);
awaitPartitionMapExchange();
}
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteChangingBaselineUpCachePutAllFailoverTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteChangingBaselineUpCachePutAllFailoverTest.java
index d29f4c9b4db..9285cae1301 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteChangingBaselineUpCachePutAllFailoverTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteChangingBaselineUpCachePutAllFailoverTest.java
@@ -22,6 +22,7 @@ import java.util.concurrent.Callable;
import java.util.concurrent.atomic.AtomicBoolean;
import org.apache.ignite.cluster.BaselineNode;
import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.DataRegionConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
@@ -69,7 +70,7 @@ public class IgniteChangingBaselineUpCachePutAllFailoverTest extends CachePutAll
startGrids(GRIDS_COUNT);
grid(0).cluster().baselineAutoAdjustEnabled(false);
- grid(0).active(true);
+ grid(0).cluster().state(ClusterState.ACTIVE);
awaitPartitionMapExchange();
}
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteChangingBaselineUpCacheRemoveFailoverTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteChangingBaselineUpCacheRemoveFailoverTest.java
index bb58a99ccd2..2b7833d9c75 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteChangingBaselineUpCacheRemoveFailoverTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteChangingBaselineUpCacheRemoveFailoverTest.java
@@ -27,6 +27,7 @@ import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.cluster.BaselineNode;
import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.DataRegionConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
@@ -91,7 +92,7 @@ public class IgniteChangingBaselineUpCacheRemoveFailoverTest extends GridCacheAb
startGrids(GRIDS_COUNT);
- grid(0).active(true);
+ grid(0).cluster().state(ClusterState.ACTIVE);
awaitPartitionMapExchange();
}
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteOfflineBaselineNodeFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteOfflineBaselineNodeFullApiSelfTest.java
index 2282165d716..81f105d39df 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteOfflineBaselineNodeFullApiSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteOfflineBaselineNodeFullApiSelfTest.java
@@ -16,6 +16,8 @@
*/
package org.apache.ignite.internal.processors.cache.persistence.baseline;
+import org.apache.ignite.cluster.ClusterState;
+
/**
* Full API cache tests with situation when there is an offline node from BaselineTopology.
*/
@@ -30,7 +32,7 @@ public class IgniteOfflineBaselineNodeFullApiSelfTest extends IgniteBaselineAbst
startGrid("offlineBaselineNode");
- grid(0).active(true);
+ grid(0).cluster().state(ClusterState.ACTIVE);
stopGrid("offlineBaselineNode");
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteOnlineNodeOutOfBaselineFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteOnlineNodeOutOfBaselineFullApiSelfTest.java
index 3bd8c0fd51f..5a96edb3edd 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteOnlineNodeOutOfBaselineFullApiSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteOnlineNodeOutOfBaselineFullApiSelfTest.java
@@ -16,6 +16,8 @@
*/
package org.apache.ignite.internal.processors.cache.persistence.baseline;
+import org.apache.ignite.cluster.ClusterState;
+
/**
* Full API cache tests with situation when there is an online node out of BaselineTopology.
*/
@@ -28,7 +30,7 @@ public class IgniteOnlineNodeOutOfBaselineFullApiSelfTest extends IgniteBaseline
startGrids(gridCount());
- grid(0).active(true);
+ grid(0).cluster().state(ClusterState.ACTIVE);
startGrid("onlineOutOfBaselineNode");
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteStableBaselineCachePutAllFailoverTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteStableBaselineCachePutAllFailoverTest.java
index 4acaec7c8a0..4531dfee26a 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteStableBaselineCachePutAllFailoverTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteStableBaselineCachePutAllFailoverTest.java
@@ -19,6 +19,7 @@ package org.apache.ignite.internal.processors.cache.persistence.baseline;
import java.util.concurrent.Callable;
import java.util.concurrent.ThreadLocalRandom;
import java.util.concurrent.atomic.AtomicBoolean;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.DataRegionConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
@@ -91,7 +92,7 @@ public class IgniteStableBaselineCachePutAllFailoverTest extends CachePutAllFail
startGrids(GRIDS_COUNT);
- grid(0).active(true);
+ grid(0).cluster().state(ClusterState.ACTIVE);
startGrid(OUT_OF_BASELINE_GRID_ID);
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteStableBaselineCacheRemoveFailoverTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteStableBaselineCacheRemoveFailoverTest.java
index 193a67ecdf3..f55c0b6a1a6 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteStableBaselineCacheRemoveFailoverTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteStableBaselineCacheRemoveFailoverTest.java
@@ -24,6 +24,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicReference;
import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.CacheMode;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.DataRegionConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
@@ -87,7 +88,7 @@ public class IgniteStableBaselineCacheRemoveFailoverTest extends GridCacheAbstra
startGrids(GRIDS_COUNT);
- grid(0).active(true);
+ grid(0).cluster().state(ClusterState.ACTIVE);
startGrid(OUT_OF_BASELINE_GRID_ID);
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/CheckpointBufferDeadlockTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/CheckpointBufferDeadlockTest.java
index 7218be92f65..16ff1fca769 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/CheckpointBufferDeadlockTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/CheckpointBufferDeadlockTest.java
@@ -26,6 +26,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
import org.apache.ignite.IgniteCache;
import org.apache.ignite.IgniteDataStreamer;
import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.DataRegionConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
@@ -166,7 +167,7 @@ public class CheckpointBufferDeadlockTest extends GridCommonAbstractTest {
IgniteEx ig = startGrid(0);
- ig.cluster().active(true);
+ ig.cluster().state(ClusterState.ACTIVE);
GridCacheDatabaseSharedManager db = (GridCacheDatabaseSharedManager)ig.context().cache().context().database();
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/FullHistRebalanceOnClientStopTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/FullHistRebalanceOnClientStopTest.java
index 7db500ae3da..7c84d32cacf 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/FullHistRebalanceOnClientStopTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/FullHistRebalanceOnClientStopTest.java
@@ -24,6 +24,7 @@ import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction;
import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.DataRegionConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
@@ -110,7 +111,7 @@ public class FullHistRebalanceOnClientStopTest extends GridCommonAbstractTest {
IgniteEx ig0 = grid(0);
- ig0.cluster().active(true);
+ ig0.cluster().state(ClusterState.ACTIVE);
IgniteCache<Object, Object> cache = ig0.cache(CACHE_NAME);
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgniteLogicalRecoveryTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgniteLogicalRecoveryTest.java
index a95227f3106..713448e49f0 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgniteLogicalRecoveryTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgniteLogicalRecoveryTest.java
@@ -37,6 +37,7 @@ import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.cache.CacheWriteSynchronizationMode;
import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction;
import org.apache.ignite.cache.query.annotations.QuerySqlField;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.DataRegionConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
@@ -193,7 +194,7 @@ public class IgniteLogicalRecoveryTest extends GridCommonAbstractTest {
public void testRecoveryOnJoinToActiveCluster() throws Exception {
IgniteEx crd = (IgniteEx)startGridsMultiThreaded(3);
- crd.cluster().active(true);
+ crd.cluster().state(ClusterState.ACTIVE);
IgniteEx node = grid(2);
@@ -225,7 +226,7 @@ public class IgniteLogicalRecoveryTest extends GridCommonAbstractTest {
public void testRecoveryOnJoinToInactiveCluster() throws Exception {
IgniteEx crd = (IgniteEx)startGridsMultiThreaded(3);
- crd.cluster().active(true);
+ crd.cluster().state(ClusterState.ACTIVE);
IgniteEx node = grid(2);
@@ -239,11 +240,11 @@ public class IgniteLogicalRecoveryTest extends GridCommonAbstractTest {
stopGrid(2, true);
- crd.cluster().active(false);
+ crd.cluster().state(ClusterState.INACTIVE);
node = startGrid(2);
- crd.cluster().active(true);
+ crd.cluster().state(ClusterState.ACTIVE);
awaitPartitionMapExchange();
@@ -288,7 +289,7 @@ public class IgniteLogicalRecoveryTest extends GridCommonAbstractTest {
private void doTestWithDynamicCaches(List<CacheConfiguration> dynamicCaches) throws Exception {
IgniteEx crd = (IgniteEx)startGridsMultiThreaded(3);
- crd.cluster().active(true);
+ crd.cluster().state(ClusterState.ACTIVE);
IgniteEx node = grid(2);
@@ -324,7 +325,7 @@ public class IgniteLogicalRecoveryTest extends GridCommonAbstractTest {
IgniteEx crd = (IgniteEx)startGridsMultiThreaded(3);
crd.cluster().baselineAutoAdjustEnabled(false);
- crd.cluster().active(true);
+ crd.cluster().state(ClusterState.ACTIVE);
IgniteEx node = grid(2);
@@ -359,7 +360,7 @@ public class IgniteLogicalRecoveryTest extends GridCommonAbstractTest {
public void testRecoveryOnCrushDuringCheckpointOnNodeStart() throws Exception {
IgniteEx crd = (IgniteEx)startGridsMultiThreaded(3, false);
- crd.cluster().active(true);
+ crd.cluster().state(ClusterState.ACTIVE);
IgniteEx node = grid(2);
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsCacheRestoreTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsCacheRestoreTest.java
index 8c8a89dbc37..bf73ca4ca66 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsCacheRestoreTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsCacheRestoreTest.java
@@ -20,6 +20,7 @@ package org.apache.ignite.internal.processors.cache.persistence.db;
import java.util.Arrays;
import java.util.List;
import org.apache.ignite.IgniteCache;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.DataRegionConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
@@ -111,7 +112,7 @@ public class IgnitePdsCacheRestoreTest extends GridCommonAbstractTest {
startGrid(i);
}
- ignite(0).active(true);
+ ignite(0).cluster().state(ClusterState.ACTIVE);
IgniteCache<Object, Object> cache1 = ignite(2).cache("c1");
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsCacheWalDisabledOnRebalancingTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsCacheWalDisabledOnRebalancingTest.java
index fb6ea25f5c0..4380e80e810 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsCacheWalDisabledOnRebalancingTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsCacheWalDisabledOnRebalancingTest.java
@@ -37,6 +37,7 @@ import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.cache.CachePeekMode;
import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction;
import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.DataRegionConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
@@ -176,7 +177,7 @@ public class IgnitePdsCacheWalDisabledOnRebalancingTest extends GridCommonAbstra
public void testClientJoinsLeavesDuringRebalancing() throws Exception {
Ignite ig0 = startGrids(2);
- ig0.active(true);
+ ig0.cluster().state(ClusterState.ACTIVE);
for (int i = 1; i < 4; i++)
fillCache(ig0.dataStreamer("cache" + i), CACHE_SIZE, GENERATING_FUNC);
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsDataRegionMetricsTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsDataRegionMetricsTest.java
index c12b40f9346..3d44f23d49a 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsDataRegionMetricsTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsDataRegionMetricsTest.java
@@ -29,6 +29,7 @@ import org.apache.ignite.DataRegionMetrics;
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCache;
import org.apache.ignite.cache.CacheMode;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.DataRegionConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
@@ -150,7 +151,7 @@ public class IgnitePdsDataRegionMetricsTest extends GridCommonAbstractTest {
for (int iter = 0; iter < ITERATIONS; iter++) {
final IgniteEx node = startGrid(0);
- node.cluster().active(true);
+ node.cluster().state(ClusterState.ACTIVE);
DataRegionMetrics currMetrics = getDfltRegionMetrics(node);
@@ -193,7 +194,7 @@ public class IgnitePdsDataRegionMetricsTest extends GridCommonAbstractTest {
IgniteEx node1 = startGrid(1);
node0.cluster().baselineAutoAdjustEnabled(false);
- node0.cluster().active(true);
+ node0.cluster().state(ClusterState.ACTIVE);
final IgniteCache<Integer, String> cache = node0.cache(DEFAULT_CACHE_NAME);
@@ -244,7 +245,7 @@ public class IgnitePdsDataRegionMetricsTest extends GridCommonAbstractTest {
public void testCheckpointBufferSize() throws Exception {
IgniteEx ig = startGrid(0);
- ig.cluster().active(true);
+ ig.cluster().state(ClusterState.ACTIVE);
DataRegionMetricsImpl regionMetrics = ig.cachex(DEFAULT_CACHE_NAME)
.context().group().dataRegion().metrics();
@@ -262,7 +263,7 @@ public class IgnitePdsDataRegionMetricsTest extends GridCommonAbstractTest {
public void testUsedCheckpointBuffer() throws Exception {
IgniteEx ig = startGrid(0);
- ig.cluster().active(true);
+ ig.cluster().state(ClusterState.ACTIVE);
final DataRegionMetricsImpl regionMetrics = ig.cachex(DEFAULT_CACHE_NAME)
.context().group().dataRegion().metrics();
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsMultiNodePutGetRestartTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsMultiNodePutGetRestartTest.java
index a28be6692ec..4247160039c 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsMultiNodePutGetRestartTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsMultiNodePutGetRestartTest.java
@@ -110,7 +110,7 @@ public class IgnitePdsMultiNodePutGetRestartTest extends GridCommonAbstractTest
try {
IgniteEx ig = grid(0);
- ig.active(true);
+ ig.cluster().state(ClusterState.ACTIVE);
checkPutGetSql(ig, true);
}
@@ -127,7 +127,7 @@ public class IgnitePdsMultiNodePutGetRestartTest extends GridCommonAbstractTest
try {
IgniteEx ig = grid(0);
- ig.active(true);
+ ig.cluster().state(ClusterState.ACTIVE);
checkPutGetSql(ig, false);
}
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsPageEvictionTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsPageEvictionTest.java
index 33b34929ae1..f88d58eaec2 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsPageEvictionTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsPageEvictionTest.java
@@ -28,6 +28,7 @@ import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction;
import org.apache.ignite.cache.query.ScanQuery;
import org.apache.ignite.cache.query.SqlFieldsQuery;
import org.apache.ignite.cache.query.annotations.QuerySqlField;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.DataRegionConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
@@ -99,7 +100,7 @@ public class IgnitePdsPageEvictionTest extends GridCommonAbstractTest {
public void testPageEvictionSql() throws Exception {
IgniteEx ig = grid(0);
- ig.active(true);
+ ig.cluster().state(ClusterState.ACTIVE);
try (IgniteDataStreamer<DbKey, DbValue> streamer = ig.dataStreamer(CACHE_NAME)) {
for (int i = 0; i < ENTRY_CNT; i++) {
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsPageReplacementDuringPartitionClearTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsPageReplacementDuringPartitionClearTest.java
index e28e5a14ebf..3621e5bebbf 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsPageReplacementDuringPartitionClearTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsPageReplacementDuringPartitionClearTest.java
@@ -31,6 +31,7 @@ import org.apache.ignite.cache.CacheWriteSynchronizationMode;
import org.apache.ignite.cache.affinity.Affinity;
import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction;
import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.DataRegionConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
@@ -108,7 +109,7 @@ public class IgnitePdsPageReplacementDuringPartitionClearTest extends GridCommon
try {
Ignite ig = ignite(0);
- ig.cluster().active(true);
+ ig.cluster().state(ClusterState.ACTIVE);
ig.cluster().baselineAutoAdjustEnabled(false);
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsRebalancingOnNotStableTopologyTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsRebalancingOnNotStableTopologyTest.java
index a31f1f6cae3..e2cf846b4af 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsRebalancingOnNotStableTopologyTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsRebalancingOnNotStableTopologyTest.java
@@ -27,6 +27,7 @@ import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.cache.CacheWriteSynchronizationMode;
import org.apache.ignite.cache.PartitionLossPolicy;
import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.DataRegionConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
@@ -58,7 +59,7 @@ public class IgnitePdsRebalancingOnNotStableTopologyTest extends GridCommonAbstr
public void test() throws Exception {
Ignite ex = startGrid(0);
- ex.active(true);
+ ex.cluster().state(ClusterState.ACTIVE);
startGrid(1);
@@ -72,7 +73,7 @@ public class IgnitePdsRebalancingOnNotStableTopologyTest extends GridCommonAbstr
Thread thread = new Thread(new Runnable() {
@Override public void run() {
- ex1.active(true);
+ ex1.cluster().state(ClusterState.ACTIVE);
try {
checkTopology(2);
@@ -135,7 +136,7 @@ public class IgnitePdsRebalancingOnNotStableTopologyTest extends GridCommonAbstr
//start cluster. it will cause memory restoration and reading WAL.
ex = startGrids(CLUSTER_SIZE);
- ex.active(true);
+ ex.cluster().state(ClusterState.ACTIVE);
checkTopology(CLUSTER_SIZE);
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsStartWIthEmptyArchive.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsStartWIthEmptyArchive.java
index e55e036304e..8e25f30e25c 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsStartWIthEmptyArchive.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsStartWIthEmptyArchive.java
@@ -23,6 +23,7 @@ import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import org.apache.ignite.IgniteDataStreamer;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.DataRegionConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
@@ -120,7 +121,7 @@ public class IgnitePdsStartWIthEmptyArchive extends GridCommonAbstractTest {
public void test() throws Exception {
IgniteEx ig = startGrid(0);
- ig.cluster().active(true);
+ ig.cluster().state(ClusterState.ACTIVE);
FileWriteAheadLogManager walMgr = (FileWriteAheadLogManager)ig.context().cache().context().wal();
@@ -175,7 +176,7 @@ public class IgnitePdsStartWIthEmptyArchive extends GridCommonAbstractTest {
afterLastArchivedAbsoluteIndex >=
(beforeLastArchivedAbsoluteIdx - segments));
- ig.cluster().active(true);
+ ig.cluster().state(ClusterState.ACTIVE);
FileWriteHandle fhAfter = U.field(walMgr, "currHnd");
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsTransactionsHangTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsTransactionsHangTest.java
index 83e047ec9ea..a2858a00d39 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsTransactionsHangTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsTransactionsHangTest.java
@@ -31,6 +31,7 @@ import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.cache.CacheWriteSynchronizationMode;
import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.BinaryConfiguration;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.DataRegionConfiguration;
@@ -161,7 +162,7 @@ public class IgnitePdsTransactionsHangTest extends GridCommonAbstractTest {
try {
final Ignite g = startGrids(2);
- g.active(true);
+ g.cluster().state(ClusterState.ACTIVE);
g.getOrCreateCache(getCacheConfiguration());
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsWholeClusterRestartTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsWholeClusterRestartTest.java
index c22cecf33ff..47548f780ea 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsWholeClusterRestartTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsWholeClusterRestartTest.java
@@ -26,6 +26,7 @@ import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.CacheRebalanceMode;
import org.apache.ignite.cache.CacheWriteSynchronizationMode;
import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.DataRegionConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
@@ -98,7 +99,7 @@ public class IgnitePdsWholeClusterRestartTest extends GridCommonAbstractTest {
public void testRestarts() throws Exception {
startGrids(GRID_CNT);
- ignite(0).active(true);
+ ignite(0).cluster().state(ClusterState.ACTIVE);
awaitPartitionMapExchange();
@@ -123,7 +124,7 @@ public class IgnitePdsWholeClusterRestartTest extends GridCommonAbstractTest {
startGrid(idx);
try {
- ignite(0).active(true);
+ ignite(0).cluster().state(ClusterState.ACTIVE);
for (int g = 0; g < GRID_CNT; g++) {
Ignite ig = ignite(g);
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsWithTtlTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsWithTtlTest.java
index 8287d895f45..60539acdf12 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsWithTtlTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsWithTtlTest.java
@@ -35,6 +35,7 @@ import org.apache.ignite.cache.CachePeekMode;
import org.apache.ignite.cache.CacheRebalanceMode;
import org.apache.ignite.cache.CacheWriteSynchronizationMode;
import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.DataRegionConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
@@ -420,7 +421,7 @@ public class IgnitePdsWithTtlTest extends GridCommonAbstractTest {
srv.cluster().baselineAutoAdjustEnabled(false);
startGrid(1);
- srv.cluster().active(true);
+ srv.cluster().state(ClusterState.ACTIVE);
ExpiryPolicy plc = CreatedExpiryPolicy.factoryOf(Duration.ONE_DAY).create();
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgniteSequentialNodeCrashRecoveryTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgniteSequentialNodeCrashRecoveryTest.java
index 8c6421fe1fd..746474a64fb 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgniteSequentialNodeCrashRecoveryTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgniteSequentialNodeCrashRecoveryTest.java
@@ -31,6 +31,7 @@ import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.ShutdownPolicy;
import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.DataRegionConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
@@ -141,7 +142,7 @@ public class IgniteSequentialNodeCrashRecoveryTest extends GridCommonAbstractTes
public void testCrashOnCheckpointAfterLogicalRecovery() throws Exception {
IgniteEx g = startGrid(0);
- g.cluster().active(true);
+ g.cluster().state(ClusterState.ACTIVE);
g.getOrCreateCache(new CacheConfiguration<>("cache")
.setAtomicityMode(CacheAtomicityMode.TRANSACTIONAL)
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/SlowHistoricalRebalanceSmallHistoryTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/SlowHistoricalRebalanceSmallHistoryTest.java
index e9df603cb38..9834b59f7a1 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/SlowHistoricalRebalanceSmallHistoryTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/SlowHistoricalRebalanceSmallHistoryTest.java
@@ -26,6 +26,7 @@ import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.CacheWriteSynchronizationMode;
import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction;
import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.DataRegionConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
@@ -127,7 +128,7 @@ public class SlowHistoricalRebalanceSmallHistoryTest extends GridCommonAbstractT
IgniteEx ig = startGrid(0);
ig.cluster().baselineAutoAdjustEnabled(false);
- ig.cluster().active(true);
+ ig.cluster().state(ClusterState.ACTIVE);
ig.getOrCreateCache(new CacheConfiguration<>(SLOW_REBALANCE_CACHE)
.setAtomicityMode(CacheAtomicityMode.TRANSACTIONAL)
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/checkpoint/CheckpointFailBeforeWriteMarkTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/checkpoint/CheckpointFailBeforeWriteMarkTest.java
index 0178b3df632..fdd9615fca5 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/checkpoint/CheckpointFailBeforeWriteMarkTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/checkpoint/CheckpointFailBeforeWriteMarkTest.java
@@ -24,6 +24,7 @@ import java.util.concurrent.atomic.AtomicInteger;
import java.util.function.Predicate;
import org.apache.ignite.IgniteCache;
import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
@@ -149,7 +150,7 @@ public class CheckpointFailBeforeWriteMarkTest extends GridCommonAbstractTest {
//given: one node with persistence.
IgniteEx ignite0 = startGrid(0);
- ignite0.cluster().active(true);
+ ignite0.cluster().state(ClusterState.ACTIVE);
//It is necessary to understanding when page replacement would be started.
PageMemory pageMemory = ignite0.context().cache().context().database().dataRegion("default").pageMemory();
@@ -183,7 +184,7 @@ public class CheckpointFailBeforeWriteMarkTest extends GridCommonAbstractTest {
//then: Data recovery after node start should be successful.
ignite0 = startGrid(0);
- ignite0.cluster().active(true);
+ ignite0.cluster().state(ClusterState.ACTIVE);
IgniteCache<Integer, Object> cache = ignite(0).cache(DEFAULT_CACHE_NAME);
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/checkpoint/CheckpointFreeListTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/checkpoint/CheckpointFreeListTest.java
index d487e86160e..470c482f9a2 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/checkpoint/CheckpointFreeListTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/checkpoint/CheckpointFreeListTest.java
@@ -46,6 +46,7 @@ import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.cache.CacheWriteSynchronizationMode;
import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
@@ -157,7 +158,7 @@ public class CheckpointFreeListTest extends GridCommonAbstractTest {
public void testFreeListRestoredCorrectly() throws Exception {
IgniteEx ignite0 = startGrid(0);
- ignite0.cluster().active(true);
+ ignite0.cluster().state(ClusterState.ACTIVE);
IgniteEx igniteClient = startClientGrid(getClientConfiguration("client"));
@@ -186,7 +187,7 @@ public class CheckpointFreeListTest extends GridCommonAbstractTest {
ignite0 = startGrid(0);
- ignite0.cluster().active(true);
+ ignite0.cluster().state(ClusterState.ACTIVE);
GridCacheOffheapManager offheap2 = cacheOffheapManager();
@@ -230,7 +231,7 @@ public class CheckpointFreeListTest extends GridCommonAbstractTest {
@WithSystemProperty(key = IgniteSystemProperties.IGNITE_PAGES_LIST_DISABLE_ONHEAP_CACHING, value = "true")
public void testRestoreFreeListCorrectlyAfterRandomStop() throws Exception {
IgniteEx ignite0 = startGrid(0);
- ignite0.cluster().active(true);
+ ignite0.cluster().state(ClusterState.ACTIVE);
Random random = new Random();
@@ -286,7 +287,7 @@ public class CheckpointFreeListTest extends GridCommonAbstractTest {
ignite0 = startGrid(0);
- ignite0.cluster().active(true);
+ ignite0.cluster().state(ClusterState.ACTIVE);
if (entriesToRemove.isEmpty())
break;
@@ -320,7 +321,7 @@ public class CheckpointFreeListTest extends GridCommonAbstractTest {
public void testFreeListUnderLoadMultipleCheckpoints() throws Throwable {
IgniteEx ignite = startGrid(0);
- ignite.cluster().active(true);
+ ignite.cluster().state(ClusterState.ACTIVE);
int minValSize = 64;
int maxValSize = 128;
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/checkpoint/CheckpointListenerForRegionTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/checkpoint/CheckpointListenerForRegionTest.java
index fb10775a438..4beaa0816d9 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/checkpoint/CheckpointListenerForRegionTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/checkpoint/CheckpointListenerForRegionTest.java
@@ -21,6 +21,7 @@ import java.util.concurrent.atomic.AtomicInteger;
import org.apache.ignite.IgniteCache;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
@@ -99,7 +100,7 @@ public class CheckpointListenerForRegionTest extends GridCommonAbstractTest {
//given: One started node with default cache.
IgniteEx ignite0 = startGrid(0);
- ignite0.cluster().active(true);
+ ignite0.cluster().state(ClusterState.ACTIVE);
IgniteCache<Integer, Object> cache = ignite0.cache(DEFAULT_CACHE_NAME);
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/checkpoint/CheckpointStartLoggingTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/checkpoint/CheckpointStartLoggingTest.java
index 0ecc7644220..0a6f8c73168 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/checkpoint/CheckpointStartLoggingTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/checkpoint/CheckpointStartLoggingTest.java
@@ -20,6 +20,7 @@ package org.apache.ignite.internal.processors.cache.persistence.db.checkpoint;
import java.util.regex.Pattern;
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCache;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.DataRegionConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
@@ -87,7 +88,7 @@ public class CheckpointStartLoggingTest extends GridCommonAbstractTest {
Ignite ignite = startGrid();
- ignite.cluster().active(true);
+ ignite.cluster().state(ClusterState.ACTIVE);
IgniteCache<Integer, Integer> cache = ignite.getOrCreateCache(DEFAULT_CACHE_NAME);
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/checkpoint/IgniteCheckpointDirtyPagesForLowLoadTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/checkpoint/IgniteCheckpointDirtyPagesForLowLoadTest.java
index 9d03bd25494..2f3cfdba0dd 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/checkpoint/IgniteCheckpointDirtyPagesForLowLoadTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/checkpoint/IgniteCheckpointDirtyPagesForLowLoadTest.java
@@ -26,6 +26,7 @@ import java.util.concurrent.TimeUnit;
import java.util.concurrent.locks.LockSupport;
import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.DataRegionConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
@@ -105,7 +106,7 @@ public class IgniteCheckpointDirtyPagesForLowLoadTest extends GridCommonAbstract
public void testManyCachesAndNotManyPuts() throws Exception {
try {
IgniteEx ignite = startGrid(0);
- ignite.active(true);
+ ignite.cluster().state(ClusterState.ACTIVE);
log.info("Saving initial data to caches");
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/checkpoint/IgniteMassLoadSandboxTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/checkpoint/IgniteMassLoadSandboxTest.java
index f74850f4136..125b4cd9ac6 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/checkpoint/IgniteMassLoadSandboxTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/checkpoint/IgniteMassLoadSandboxTest.java
@@ -41,6 +41,7 @@ import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.CacheRebalanceMode;
import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction;
import org.apache.ignite.cache.query.annotations.QuerySqlField;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.BinaryConfiguration;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.DataRegionConfiguration;
@@ -191,7 +192,7 @@ public class IgniteMassLoadSandboxTest extends GridCommonAbstractTest {
final IgniteEx ignite = startGrid(1);
- ignite.active(true);
+ ignite.cluster().state(ClusterState.ACTIVE);
final IgniteCache<Object, HugeIndexedObject> cache = ignite.cache(CACHE_NAME);
final int threads = Runtime.getRuntime().availableProcessors();
@@ -253,7 +254,7 @@ public class IgniteMassLoadSandboxTest extends GridCommonAbstractTest {
final IgniteEx ignite = startGrid(1);
- ignite.active(true);
+ ignite.cluster().state(ClusterState.ACTIVE);
final int threads = 1;
Runtime.getRuntime().availableProcessors();
@@ -330,7 +331,7 @@ public class IgniteMassLoadSandboxTest extends GridCommonAbstractTest {
final Ignite ignite = G.start(cfg);
- ignite.cluster().active(true);
+ ignite.cluster().state(ClusterState.ACTIVE);
final IgniteCache<Object, Object> cache = ignite.cache(CACHE_NAME);
@@ -416,7 +417,7 @@ public class IgniteMassLoadSandboxTest extends GridCommonAbstractTest {
private void runVerification(int threads, final int recsPerThread) throws Exception {
final Ignite restartedIgnite = startGrid(1);
- restartedIgnite.active(true);
+ restartedIgnite.cluster().state(ClusterState.ACTIVE);
final IgniteCache<Integer, HugeIndexedObject> restartedCache = restartedIgnite.cache(CACHE_NAME);
@@ -499,7 +500,7 @@ public class IgniteMassLoadSandboxTest extends GridCommonAbstractTest {
try {
final IgniteEx ignite = startGrid(1);
- ignite.active(true);
+ ignite.cluster().state(ClusterState.ACTIVE);
checkpointFrequency = 20 * 1000;
final IgniteCache<Object, HugeIndexedObject> cache = ignite.cache(CACHE_NAME);
int totalRecs = 400_000;
@@ -545,7 +546,7 @@ public class IgniteMassLoadSandboxTest extends GridCommonAbstractTest {
final Ignite restartedIgnite = startGrid(1);
- restartedIgnite.active(true);
+ restartedIgnite.cluster().state(ClusterState.ACTIVE);
final IgniteCache<Object, HugeIndexedObject> restartedCache = restartedIgnite.cache(CACHE_NAME);
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/checkpoint/LightweightCheckpointTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/checkpoint/LightweightCheckpointTest.java
index ce08f216495..9044e1b208b 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/checkpoint/LightweightCheckpointTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/checkpoint/LightweightCheckpointTest.java
@@ -23,6 +23,7 @@ import java.util.Arrays;
import org.apache.ignite.IgniteCache;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.DataRegionConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
@@ -125,7 +126,7 @@ public class LightweightCheckpointTest extends GridCommonAbstractTest {
public void testLightCheckpointAbleToStoreOnlyGivenDataRegion() throws Exception {
//given: One started node with default cache and cache which won't be checkpointed.
IgniteEx ignite0 = startGrid(0);
- ignite0.cluster().active(true);
+ ignite0.cluster().state(ClusterState.ACTIVE);
IgniteCache<Integer, Object> checkpointedCache = ignite0.cache(DEFAULT_CACHE_NAME);
IgniteCache<Integer, Object> notCheckpointedCache = ignite0.cache(NOT_CHECKPOINTED_CACHE);
@@ -180,7 +181,7 @@ public class LightweightCheckpointTest extends GridCommonAbstractTest {
stopAllGrids();
ignite0 = startGrid(0);
- ignite0.cluster().active(true);
+ ignite0.cluster().state(ClusterState.ACTIVE);
checkpointedCache = ignite0.cache(DEFAULT_CACHE_NAME);
notCheckpointedCache = ignite0.cache(NOT_CHECKPOINTED_CACHE);
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/file/DefaultPageSizeBackwardsCompatibilityTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/file/DefaultPageSizeBackwardsCompatibilityTest.java
index 04b5852fac2..c3fb2a2767a 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/file/DefaultPageSizeBackwardsCompatibilityTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/file/DefaultPageSizeBackwardsCompatibilityTest.java
@@ -21,6 +21,7 @@ import org.apache.ignite.IgniteCache;
import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.CacheWriteSynchronizationMode;
import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.DataRegionConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
@@ -102,7 +103,7 @@ public class DefaultPageSizeBackwardsCompatibilityTest extends GridCommonAbstrac
Ignite ig = ignite(0);
- ig.active(true);
+ ig.cluster().state(ClusterState.ACTIVE);
awaitPartitionMapExchange();
@@ -121,7 +122,7 @@ public class DefaultPageSizeBackwardsCompatibilityTest extends GridCommonAbstrac
ig = ignite(0);
- ig.active(true);
+ ig.cluster().state(ClusterState.ACTIVE);
awaitPartitionMapExchange();
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/file/IgnitePdsCacheDestroyDuringCheckpointTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/file/IgnitePdsCacheDestroyDuringCheckpointTest.java
index e2bc4b1c57f..f1dadb7326e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/file/IgnitePdsCacheDestroyDuringCheckpointTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/file/IgnitePdsCacheDestroyDuringCheckpointTest.java
@@ -22,6 +22,7 @@ import org.apache.ignite.IgniteCache;
import org.apache.ignite.IgniteDataStreamer;
import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.CachePeekMode;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.DataRegionConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
@@ -92,7 +93,7 @@ public class IgnitePdsCacheDestroyDuringCheckpointTest extends GridCommonAbstrac
@Test
public void testCacheCreatePutCheckpointDestroy() throws Exception {
IgniteEx ig = startGrid(0);
- ig.active(true);
+ ig.cluster().state(ClusterState.ACTIVE);
for (int j = 0; j < NUM_ITERATIONS; j++) {
Ignite client = startClientGrid(1);
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/file/IgnitePdsCacheIntegrationTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/file/IgnitePdsCacheIntegrationTest.java
index c3ddba5ed5b..622e2d56fd8 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/file/IgnitePdsCacheIntegrationTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/file/IgnitePdsCacheIntegrationTest.java
@@ -29,6 +29,7 @@ import org.apache.ignite.cache.CacheWriteSynchronizationMode;
import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction;
import org.apache.ignite.cache.query.SqlFieldsQuery;
import org.apache.ignite.cache.query.annotations.QuerySqlField;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.BinaryConfiguration;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.DataRegionConfiguration;
@@ -111,7 +112,7 @@ public class IgnitePdsCacheIntegrationTest extends GridCommonAbstractTest {
try {
IgniteEx ig = grid(0);
- ig.active(true);
+ ig.cluster().state(ClusterState.ACTIVE);
checkPutGetSql(ig, true);
}
@@ -128,7 +129,7 @@ public class IgnitePdsCacheIntegrationTest extends GridCommonAbstractTest {
try {
IgniteEx ig = grid(0);
- ig.active(true);
+ ig.cluster().state(ClusterState.ACTIVE);
checkPutGetSql(ig, false);
}
@@ -147,7 +148,7 @@ public class IgnitePdsCacheIntegrationTest extends GridCommonAbstractTest {
try {
final IgniteEx grid = grid(0);
- grid.active(true);
+ grid.cluster().state(ClusterState.ACTIVE);
GridTestUtils.runMultiThreaded(new Callable<Object>() {
@Override public Object call() throws Exception {
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/file/IgnitePdsCheckpointSimulationWithRealCpDisabledTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/file/IgnitePdsCheckpointSimulationWithRealCpDisabledTest.java
index 5bca3ee34d0..0706a3a8e9c 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/file/IgnitePdsCheckpointSimulationWithRealCpDisabledTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/file/IgnitePdsCheckpointSimulationWithRealCpDisabledTest.java
@@ -38,6 +38,7 @@ import java.util.concurrent.locks.ReentrantReadWriteLock;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.CacheRebalanceMode;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.DataRegionConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
@@ -152,7 +153,7 @@ public class IgnitePdsCheckpointSimulationWithRealCpDisabledTest extends GridCom
public void testCheckpointSimulationMultiThreaded() throws Exception {
IgniteEx ig = startGrid(0);
- ig.cluster().active(true);
+ ig.cluster().state(ClusterState.ACTIVE);
GridCacheSharedContext<Object, Object> shared = ig.context().cache().context();
@@ -190,7 +191,7 @@ public class IgnitePdsCheckpointSimulationWithRealCpDisabledTest extends GridCom
ig = startGrid(0);
- ig.cluster().active(true);
+ ig.cluster().state(ClusterState.ACTIVE);
shared = ig.context().cache().context();
@@ -210,7 +211,7 @@ public class IgnitePdsCheckpointSimulationWithRealCpDisabledTest extends GridCom
public void testGetForInitialWrite() throws Exception {
IgniteEx ig = startGrid(0);
- ig.cluster().active(true);
+ ig.cluster().state(ClusterState.ACTIVE);
GridCacheSharedContext<Object, Object> shared = ig.context().cache().context();
@@ -268,7 +269,7 @@ public class IgnitePdsCheckpointSimulationWithRealCpDisabledTest extends GridCom
ig = startGrid(0);
- ig.cluster().active(true);
+ ig.cluster().state(ClusterState.ACTIVE);
shared = ig.context().cache().context();
@@ -326,7 +327,7 @@ public class IgnitePdsCheckpointSimulationWithRealCpDisabledTest extends GridCom
private void checkDataWalEntries(boolean mvcc) throws Exception {
IgniteEx ig = startGrid(0);
- ig.cluster().active(true);
+ ig.cluster().state(ClusterState.ACTIVE);
GridCacheSharedContext<Object, Object> sharedCtx = ig.context().cache().context();
GridCacheContext<Object, Object> cctx = sharedCtx.cache().cache(mvcc ? MVCC_CACHE_NAME : CACHE_NAME).context();
@@ -375,7 +376,7 @@ public class IgnitePdsCheckpointSimulationWithRealCpDisabledTest extends GridCom
ig = startGrid(0);
- ig.cluster().active(true);
+ ig.cluster().state(ClusterState.ACTIVE);
sharedCtx = ig.context().cache().context();
cctx = sharedCtx.cache().cache(mvcc ? MVCC_CACHE_NAME : CACHE_NAME).context();
@@ -449,7 +450,7 @@ public class IgnitePdsCheckpointSimulationWithRealCpDisabledTest extends GridCom
public void testPageWalEntries() throws Exception {
IgniteEx ig = startGrid(0);
- ig.cluster().active(true);
+ ig.cluster().state(ClusterState.ACTIVE);
GridCacheSharedContext<Object, Object> sharedCtx = ig.context().cache().context();
int cacheId = sharedCtx.cache().cache(CACHE_NAME).context().cacheId();
@@ -496,7 +497,7 @@ public class IgnitePdsCheckpointSimulationWithRealCpDisabledTest extends GridCom
ig = startGrid(0);
- ig.cluster().active(true);
+ ig.cluster().state(ClusterState.ACTIVE);
sharedCtx = ig.context().cache().context();
@@ -552,7 +553,7 @@ public class IgnitePdsCheckpointSimulationWithRealCpDisabledTest extends GridCom
public void testDirtyFlag() throws Exception {
IgniteEx ig = startGrid(0);
- ig.cluster().active(true);
+ ig.cluster().state(ClusterState.ACTIVE);
GridCacheSharedContext<Object, Object> shared = ig.context().cache().context();
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/file/IgnitePdsDiskErrorsRecoveringTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/file/IgnitePdsDiskErrorsRecoveringTest.java
index a3697331e57..eabe3c83a4f 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/file/IgnitePdsDiskErrorsRecoveringTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/file/IgnitePdsDiskErrorsRecoveringTest.java
@@ -29,6 +29,7 @@ import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.CacheRebalanceMode;
import org.apache.ignite.cache.CacheWriteSynchronizationMode;
import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.DataRegionConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
@@ -137,7 +138,7 @@ public class IgnitePdsDiskErrorsRecoveringTest extends GridCommonAbstractTest {
try {
IgniteEx grid = startGrid(0);
- grid.cluster().active(true);
+ grid.cluster().state(ClusterState.ACTIVE);
}
catch (Exception e) {
throw new RuntimeException("Failed to start node.", e);
@@ -160,7 +161,7 @@ public class IgnitePdsDiskErrorsRecoveringTest extends GridCommonAbstractTest {
IgniteEx grid = startGrid(0);
- grid.cluster().active(true);
+ grid.cluster().state(ClusterState.ACTIVE);
}
/**
@@ -177,7 +178,7 @@ public class IgnitePdsDiskErrorsRecoveringTest extends GridCommonAbstractTest {
);
final IgniteEx grid = startGrid(0);
- grid.cluster().active(true);
+ grid.cluster().state(ClusterState.ACTIVE);
for (int i = 0; i < 1000; i++) {
byte payload = (byte)i;
@@ -207,7 +208,7 @@ public class IgnitePdsDiskErrorsRecoveringTest extends GridCommonAbstractTest {
ioFactory = null;
IgniteEx recoveredGrid = startGrid(0);
- recoveredGrid.cluster().active(true);
+ recoveredGrid.cluster().state(ClusterState.ACTIVE);
for (int i = 0; i < 1000; i++) {
byte payload = (byte)i;
@@ -228,7 +229,7 @@ public class IgnitePdsDiskErrorsRecoveringTest extends GridCommonAbstractTest {
ioFactory = new FilteringFileIOFactory(".bin", new LimitedSizeFileIOFactory(new RandomAccessFileIOFactory(), 128 * PAGE_SIZE));
final IgniteEx grid = startGrid(0);
- grid.cluster().active(true);
+ grid.cluster().state(ClusterState.ACTIVE);
for (int i = 0; i < 1000; i++) {
byte payload = (byte)i;
@@ -257,7 +258,7 @@ public class IgnitePdsDiskErrorsRecoveringTest extends GridCommonAbstractTest {
ioFactory = null;
IgniteEx recoveredGrid = startGrid(0);
- recoveredGrid.cluster().active(true);
+ recoveredGrid.cluster().state(ClusterState.ACTIVE);
for (int i = 0; i < 1000; i++) {
byte payload = (byte)i;
@@ -308,7 +309,7 @@ public class IgnitePdsDiskErrorsRecoveringTest extends GridCommonAbstractTest {
wal.setFileIOFactory(ioFactory);
- grid.cluster().active(true);
+ grid.cluster().state(ClusterState.ACTIVE);
int failedPosition = -1;
@@ -342,7 +343,7 @@ public class IgnitePdsDiskErrorsRecoveringTest extends GridCommonAbstractTest {
// Grid should be successfully recovered after stopping.
grid = startGrid(0);
- grid.cluster().active(true);
+ grid.cluster().state(ClusterState.ACTIVE);
for (int i = 0; i < failedPosition; i++) {
byte payload = (byte)i;
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/file/IgnitePdsNoActualWalHistoryTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/file/IgnitePdsNoActualWalHistoryTest.java
index 889b601c07d..77dcba76131 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/file/IgnitePdsNoActualWalHistoryTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/file/IgnitePdsNoActualWalHistoryTest.java
@@ -25,6 +25,7 @@ import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.CacheRebalanceMode;
import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction;
import org.apache.ignite.cache.query.annotations.QuerySqlField;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.BinaryConfiguration;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.DataRegionConfiguration;
@@ -104,7 +105,7 @@ public class IgnitePdsNoActualWalHistoryTest extends GridCommonAbstractTest {
try {
IgniteEx ignite = startGrid(1);
- ignite.active(true);
+ ignite.cluster().state(ClusterState.ACTIVE);
IgniteCache<Object, Object> cache = ignite.cache(CACHE_NAME);
@@ -149,7 +150,7 @@ public class IgnitePdsNoActualWalHistoryTest extends GridCommonAbstractTest {
ignite = startGrid(1);
- ignite.active(true);
+ ignite.cluster().state(ClusterState.ACTIVE);
cache = ignite.cache(CACHE_NAME);
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/file/IgnitePdsPageReplacementTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/file/IgnitePdsPageReplacementTest.java
index 2193f5439b7..ef3a8851904 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/file/IgnitePdsPageReplacementTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/file/IgnitePdsPageReplacementTest.java
@@ -22,6 +22,7 @@ import java.util.Collection;
import java.util.List;
import java.util.concurrent.Callable;
import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.DataPageEvictionMode;
import org.apache.ignite.configuration.DataRegionConfiguration;
@@ -118,7 +119,7 @@ public class IgnitePdsPageReplacementTest extends GridCommonAbstractTest {
public void testPageReplacement() throws Exception {
final IgniteEx ig = startGrid(0);
- ig.active(true);
+ ig.cluster().state(ClusterState.ACTIVE);
final PageMemory memory = getMemory(ig);
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/filename/IgniteUidAsConsistentIdMigrationTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/filename/IgniteUidAsConsistentIdMigrationTest.java
index 92408920a44..bc8677880c4 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/filename/IgniteUidAsConsistentIdMigrationTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/filename/IgniteUidAsConsistentIdMigrationTest.java
@@ -27,6 +27,7 @@ import java.util.regex.Pattern;
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCache;
import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.DataRegionConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
@@ -306,12 +307,12 @@ public class IgniteUidAsConsistentIdMigrationTest extends GridCommonAbstractTest
assertPdsDirsDefaultExist(genNewStyleSubfolderName(0, ignite));
uuid = (UUID)ignite.cluster().localNode().consistentId();
- ignite.active(false);
+ ignite.cluster().state(ClusterState.INACTIVE);
}
{
final Ignite igniteRestart = startActivateGrid(1);
- grid(0).active(true);
+ grid(0).cluster().state(ClusterState.ACTIVE);
final Object consIdRestart = igniteRestart.cluster().localNode().consistentId();
assertPdsDirsDefaultExist(genNewStyleSubfolderName(1, igniteRestart));
@@ -346,7 +347,7 @@ public class IgniteUidAsConsistentIdMigrationTest extends GridCommonAbstractTest
@NotNull private Ignite startActivateGrid(int idx) throws Exception {
final Ignite ignite = startGrid(idx);
- ignite.active(true);
+ ignite.cluster().state(ClusterState.ACTIVE);
return ignite;
}
@@ -378,7 +379,7 @@ public class IgniteUidAsConsistentIdMigrationTest extends GridCommonAbstractTest
final Ignite ignite0 = startGrid(0);
final Ignite ignite1 = startGrid(1);
- ignite0.active(true);
+ ignite0.cluster().state(ClusterState.ACTIVE);
ignite0.getOrCreateCache(CACHE_NAME).put("hi", "there!");
ignite1.getOrCreateCache(CACHE_NAME).put("hi1", "there!");
@@ -403,7 +404,7 @@ public class IgniteUidAsConsistentIdMigrationTest extends GridCommonAbstractTest
final Ignite ignite2 = startGrid(2);
final Ignite ignite3 = startGrid(3);
- ignite0.active(true);
+ ignite0.cluster().state(ClusterState.ACTIVE);
ignite0.getOrCreateCache(CACHE_NAME).put("hi", "there!");
ignite3.getOrCreateCache(CACHE_NAME).put("hi1", "there!");
@@ -433,7 +434,7 @@ public class IgniteUidAsConsistentIdMigrationTest extends GridCommonAbstractTest
public void testNewStyleAlwaysSmallestNodeIndexIsCreatedMultithreaded() throws Exception {
final Ignite ignite0 = startGridsMultiThreaded(11);
- ignite0.active(true);
+ ignite0.cluster().state(ClusterState.ACTIVE);
ignite0.getOrCreateCache(CACHE_NAME).put("hi", "there!");
ignite0.getOrCreateCache(CACHE_NAME).put("hi1", "there!");
@@ -469,7 +470,7 @@ public class IgniteUidAsConsistentIdMigrationTest extends GridCommonAbstractTest
this.configuredConsistentId = expDfltConsistentId2; //this is for create old node folder
final Ignite ignite2 = startGrid(1);
- ignite.active(true);
+ ignite.cluster().state(ClusterState.ACTIVE);
final String expVal = "there is compatible mode with old style folders!";
@@ -484,7 +485,7 @@ public class IgniteUidAsConsistentIdMigrationTest extends GridCommonAbstractTest
final Ignite igniteRestart = startGrid(0);
final Ignite igniteRestart2 = startGrid(1);
- igniteRestart2.active(true);
+ igniteRestart2.cluster().state(ClusterState.ACTIVE);
assertEquals(expDfltConsistentId1, igniteRestart.cluster().localNode().consistentId());
assertEquals(expDfltConsistentId2, igniteRestart2.cluster().localNode().consistentId());
@@ -515,7 +516,7 @@ public class IgniteUidAsConsistentIdMigrationTest extends GridCommonAbstractTest
final Ignite ignite1 = startGrid(0);
final Ignite ignite2 = startGrid(1);
- ignite1.active(true);
+ ignite1.cluster().state(ClusterState.ACTIVE);
final String expVal = "there is compatible mode with old style folders!";
@@ -535,7 +536,7 @@ public class IgniteUidAsConsistentIdMigrationTest extends GridCommonAbstractTest
final Ignite igniteRestart = startGrid(0);
final Ignite igniteRestart2 = startGrid(1);
- igniteRestart2.active(true);
+ igniteRestart2.cluster().state(ClusterState.ACTIVE);
assertEquals(consistentId1, igniteRestart.cluster().localNode().consistentId());
assertEquals(consistentId2, igniteRestart2.cluster().localNode().consistentId());
@@ -558,7 +559,7 @@ public class IgniteUidAsConsistentIdMigrationTest extends GridCommonAbstractTest
final Ignite ignite1 = startGrid(0);
- ignite1.active(true);
+ ignite1.cluster().state(ClusterState.ACTIVE);
final String expVal = "there is compatible mode with old style folders!";
@@ -575,7 +576,7 @@ public class IgniteUidAsConsistentIdMigrationTest extends GridCommonAbstractTest
final Ignite igniteRestart = startGrid(0);
- igniteRestart.active(true);
+ igniteRestart.cluster().state(ClusterState.ACTIVE);
assertEquals(consistentId1, igniteRestart.cluster().localNode().consistentId());
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/FsyncWalRolloverDoesNotBlockTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/FsyncWalRolloverDoesNotBlockTest.java
index 632e3cab464..4f5e7b95f77 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/FsyncWalRolloverDoesNotBlockTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/FsyncWalRolloverDoesNotBlockTest.java
@@ -17,6 +17,7 @@
package org.apache.ignite.internal.processors.cache.persistence.db.wal;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.DataRegionConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
@@ -69,7 +70,7 @@ public class FsyncWalRolloverDoesNotBlockTest extends GridCommonAbstractTest {
public void test() throws Exception {
IgniteEx ig = startGrid(0);
- ig.cluster().active(true);
+ ig.cluster().state(ClusterState.ACTIVE);
ig.context().cache().context().database().checkpointReadLock();
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/HistoricalReservationTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/HistoricalReservationTest.java
index 70b4202ba7f..5478ec6e085 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/HistoricalReservationTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/HistoricalReservationTest.java
@@ -20,6 +20,7 @@ package org.apache.ignite.internal.processors.cache.persistence.db.wal;
import java.util.concurrent.atomic.AtomicBoolean;
import org.apache.ignite.IgniteDataStreamer;
import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.DataRegionConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
@@ -85,7 +86,7 @@ public class HistoricalReservationTest extends GridCommonAbstractTest {
@Test
public void testDeactivated() throws Exception {
historicalRebalance(() -> {
- G.allGrids().get(0).active(false);
+ G.allGrids().get(0).cluster().state(ClusterState.INACTIVE);
});
}
@@ -119,7 +120,7 @@ public class HistoricalReservationTest extends GridCommonAbstractTest {
public void testDeactivateAndRestartGrid() throws Exception {
historicalRebalance(() -> {
try {
- G.allGrids().get(0).active(false);
+ G.allGrids().get(0).cluster().state(ClusterState.INACTIVE);
stopAllGrids();
@@ -141,13 +142,13 @@ public class HistoricalReservationTest extends GridCommonAbstractTest {
public void testDeactivateAndRestartGridActive() throws Exception {
historicalRebalance(() -> {
try {
- G.allGrids().get(0).active(false);
+ G.allGrids().get(0).cluster().state(ClusterState.INACTIVE);
stopAllGrids();
startGrids(CLUSTER_NODES);
- G.allGrids().get(0).active(true);
+ G.allGrids().get(0).cluster().state(ClusterState.ACTIVE);
}
catch (Exception e) {
fail(e.getMessage());
@@ -167,7 +168,7 @@ public class HistoricalReservationTest extends GridCommonAbstractTest {
IgniteEx ignite0 = startGrids(CLUSTER_NODES);
IgniteEx rebalancedNode = startGrid(rebalancedNodeName);
- ignite0.cluster().active(true);
+ ignite0.cluster().state(ClusterState.ACTIVE);
preloadData(ignite0, 0, 100);
@@ -202,7 +203,7 @@ public class HistoricalReservationTest extends GridCommonAbstractTest {
rebalancedNode = startGrid(cfg);
- rebalancedNode.cluster().active(true);
+ rebalancedNode.cluster().state(ClusterState.ACTIVE);
awaitPartitionMapExchange();
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteNodeStoppedDuringDisableWALTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteNodeStoppedDuringDisableWALTest.java
index 063d9fb9dd3..bf56dffdf2e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteNodeStoppedDuringDisableWALTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteNodeStoppedDuringDisableWALTest.java
@@ -28,6 +28,7 @@ import java.util.stream.Collectors;
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.IgniteDataStreamer;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.DataRegionConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
@@ -184,7 +185,7 @@ public class IgniteNodeStoppedDuringDisableWALTest extends GridCommonAbstractTes
ig0.context().internalSubscriptionProcessor().registerMetastorageListener(walDisableContext);
- ig0.cluster().active(true);
+ ig0.cluster().state(ClusterState.ACTIVE);
try (IgniteDataStreamer<Integer, Integer> st = ig0.dataStreamer(DEFAULT_CACHE_NAME)) {
st.allowOverwrite(true);
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWALTailIsReachedDuringIterationOverArchiveTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWALTailIsReachedDuringIterationOverArchiveTest.java
index 9d8cfaf2f96..5681d1e1799 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWALTailIsReachedDuringIterationOverArchiveTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWALTailIsReachedDuringIterationOverArchiveTest.java
@@ -26,6 +26,7 @@ import java.util.Random;
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.IgniteDataStreamer;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.DataRegionConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
@@ -85,7 +86,7 @@ public class IgniteWALTailIsReachedDuringIterationOverArchiveTest extends GridCo
Ignite ig = startGrid();
- ig.cluster().active(true);
+ ig.cluster().state(ClusterState.ACTIVE);
try (IgniteDataStreamer<Integer, byte[]> st = ig.dataStreamer(DEFAULT_CACHE_NAME)) {
st.allowOverwrite(true);
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalFlushFailoverTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalFlushFailoverTest.java
index 27316153f0f..4cdd0b126a6 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalFlushFailoverTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalFlushFailoverTest.java
@@ -25,6 +25,7 @@ import java.nio.file.OpenOption;
import java.util.concurrent.atomic.AtomicBoolean;
import org.apache.ignite.IgniteCache;
import org.apache.ignite.cache.CacheAtomicityMode;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.DataRegionConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
@@ -134,7 +135,7 @@ public class IgniteWalFlushFailoverTest extends GridCommonAbstractTest {
wal.setFileIOFactory(new FailingFileIOFactory(canFail));
try {
- grid.active(true);
+ grid.cluster().state(ClusterState.ACTIVE);
IgniteCache<Object, Object> cache = grid.cache(TEST_CACHE);
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalFlushMultiNodeFailoverAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalFlushMultiNodeFailoverAbstractSelfTest.java
index ea598f576fb..e73753d518f 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalFlushMultiNodeFailoverAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalFlushMultiNodeFailoverAbstractSelfTest.java
@@ -27,6 +27,7 @@ import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCache;
import org.apache.ignite.IgniteSystemProperties;
import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.DataRegionConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
@@ -177,7 +178,7 @@ public abstract class IgniteWalFlushMultiNodeFailoverAbstractSelfTest extends Gr
Ignite ig = startGrids(gridCount());
ig.cluster().baselineAutoAdjustEnabled(false);
- ig.cluster().active(true);
+ ig.cluster().state(ClusterState.ACTIVE);
IgniteCache<Object, Object> cache = ig.cache(DEFAULT_CACHE_NAME);
@@ -234,7 +235,7 @@ public abstract class IgniteWalFlushMultiNodeFailoverAbstractSelfTest extends Gr
Ignite grid0 = startGrids(gridCount() + 1);
- grid0.cluster().active(true);
+ grid0.cluster().state(ClusterState.ACTIVE);
cache = grid0.cache(DEFAULT_CACHE_NAME);
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalFormatFileFailoverTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalFormatFileFailoverTest.java
index f82a64d8f5e..560d6f34430 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalFormatFileFailoverTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalFormatFileFailoverTest.java
@@ -24,6 +24,7 @@ import java.util.Arrays;
import java.util.concurrent.atomic.AtomicReference;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.cache.CacheAtomicityMode;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.DataRegionConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
@@ -145,7 +146,7 @@ public class IgniteWalFormatFileFailoverTest extends GridCommonAbstractTest {
failMtdNameRef.set(formatFile);
- grid(0).cluster().active(true);
+ grid(0).cluster().state(ClusterState.ACTIVE);
checkCause(failureHandler(0).awaitFailure(2000).error());
checkCause(failureHandler(1).awaitFailure(2000).error());
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalHistoryReservationsTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalHistoryReservationsTest.java
index 924f4368249..4033eb60cbc 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalHistoryReservationsTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalHistoryReservationsTest.java
@@ -26,6 +26,7 @@ import org.apache.ignite.IgniteSystemProperties;
import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.CacheWriteSynchronizationMode;
import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.DataRegionConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
@@ -136,7 +137,7 @@ public class IgniteWalHistoryReservationsTest extends GridCommonAbstractTest {
final IgniteEx ig0 = (IgniteEx)startGrids(initGridCnt + 1);
- ig0.cluster().active(true);
+ ig0.cluster().state(ClusterState.ACTIVE);
stopGrid(initGridCnt);
@@ -292,7 +293,7 @@ public class IgniteWalHistoryReservationsTest extends GridCommonAbstractTest {
IgniteEx ig0 = (IgniteEx)startGrids(2);
- ig0.cluster().active(true);
+ ig0.cluster().state(ClusterState.ACTIVE);
IgniteCache<Integer, Integer> cache = ig0.cache("cache1");
@@ -344,7 +345,7 @@ public class IgniteWalHistoryReservationsTest extends GridCommonAbstractTest {
IgniteEx ig0 = (IgniteEx)startGrids(2);
- ig0.cluster().active(true);
+ ig0.cluster().state(ClusterState.ACTIVE);
IgniteCache<Integer, Integer> cache = ig0.cache("cache1");
@@ -411,7 +412,7 @@ public class IgniteWalHistoryReservationsTest extends GridCommonAbstractTest {
IgniteEx ig0 = startGrids(2);
- ig0.cluster().active(true);
+ ig0.cluster().state(ClusterState.ACTIVE);
IgniteCache<Integer, Integer> cache = ig0.cache("cache1");
@@ -439,7 +440,7 @@ public class IgniteWalHistoryReservationsTest extends GridCommonAbstractTest {
Ignite ig1 = startGrid(1);
- ig1.cluster().active(true);
+ ig1.cluster().state(ClusterState.ACTIVE);
}
/**
@@ -456,7 +457,7 @@ public class IgniteWalHistoryReservationsTest extends GridCommonAbstractTest {
final Ignite ig0 = startGrids(initGridCnt);
- ig0.cluster().active(true);
+ ig0.cluster().state(ClusterState.ACTIVE);
IgniteCache<Object, Object> cache = ig0.cache("cache1");
@@ -541,7 +542,7 @@ public class IgniteWalHistoryReservationsTest extends GridCommonAbstractTest {
IgniteEx grid = startGrids(2);
- grid.cluster().active(true);
+ grid.cluster().state(ClusterState.ACTIVE);
IgniteCache<Object, Object> cache = grid.createCache(new CacheConfiguration<>("cache").setBackups(1));
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalRebalanceLoggingTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalRebalanceLoggingTest.java
index ee743e6acfb..5656482d2f8 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalRebalanceLoggingTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalRebalanceLoggingTest.java
@@ -20,6 +20,7 @@ package org.apache.ignite.internal.processors.cache.persistence.db.wal;
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCache;
import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
@@ -191,7 +192,7 @@ public class IgniteWalRebalanceLoggingTest extends GridCommonAbstractTest {
*/
private void checkFollowingPartitionsWereReservedForPotentialHistoryRebalanceMsg(LogListener... lsnrs)
throws Exception {
- startGridsMultiThreaded(2).cluster().active(true);
+ startGridsMultiThreaded(2).cluster().state(ClusterState.ACTIVE);
IgniteCache<Integer, String> cache1 = createCache("cache1", "cache_group1");
IgniteCache<Integer, String> cache2 = createCache("cache2", "cache_group2");
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalRebalanceTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalRebalanceTest.java
index 4def727aedb..730b7257998 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalRebalanceTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalRebalanceTest.java
@@ -46,6 +46,7 @@ import org.apache.ignite.cache.affinity.rendezvous.ClusterNodeAttributeAffinityB
import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction;
import org.apache.ignite.cache.query.annotations.QuerySqlField;
import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.DataRegionConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
@@ -1434,7 +1435,7 @@ public class IgniteWalRebalanceTest extends GridCommonAbstractTest {
IgniteEx crd = (IgniteEx)startGridsMultiThreaded(3);
- crd.cluster().active(true);
+ crd.cluster().state(ClusterState.ACTIVE);
IgniteCache<Integer, String> cache0 = crd.cache(CACHE_NAME);
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalRecoveryPPCTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalRecoveryPPCTest.java
index c7f357b6285..ce2e69b9d2f 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalRecoveryPPCTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalRecoveryPPCTest.java
@@ -22,6 +22,7 @@ import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.CacheRebalanceMode;
import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction;
import org.apache.ignite.cache.query.annotations.QuerySqlField;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.BinaryConfiguration;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.DataRegionConfiguration;
@@ -143,7 +144,7 @@ public class IgniteWalRecoveryPPCTest extends GridCommonAbstractTest {
try {
IgniteEx ignite = startGrid(1);
- ignite.active(true);
+ ignite.cluster().state(ClusterState.ACTIVE);
IgniteCache<Object, Object> cache1 = ignite.cache(CACHE_NAME_1);
IgniteCache<Object, Object> cache2 = ignite.cache(CACHE_NAME_2);
@@ -201,7 +202,7 @@ public class IgniteWalRecoveryPPCTest extends GridCommonAbstractTest {
ignite = startGrid(1);
- ignite.active(true);
+ ignite.cluster().state(ClusterState.ACTIVE);
cache1 = ignite.cache(CACHE_NAME_1);
cache2 = ignite.cache(CACHE_NAME_2);
@@ -240,7 +241,7 @@ public class IgniteWalRecoveryPPCTest extends GridCommonAbstractTest {
try {
IgniteEx ignite = startGrid(1);
- ignite.active(true);
+ ignite.cluster().state(ClusterState.ACTIVE);
IgniteCache<Integer, Object> dynamicPersistent = ignite.getOrCreateCache(
new CacheConfiguration<Integer, Object>()
@@ -266,7 +267,7 @@ public class IgniteWalRecoveryPPCTest extends GridCommonAbstractTest {
ignite = startGrid(1);
- ignite.active(true);
+ ignite.cluster().state(ClusterState.ACTIVE);
dynamicPersistent = ignite.cache("dynamicPersistent");
dynamicVolatile = ignite.cache("dynamicVolatile");
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalRecoverySeveralRestartsTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalRecoverySeveralRestartsTest.java
index e941f340fe2..43bde296687 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalRecoverySeveralRestartsTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalRecoverySeveralRestartsTest.java
@@ -26,6 +26,7 @@ import org.apache.ignite.cache.CacheRebalanceMode;
import org.apache.ignite.cache.CacheWriteSynchronizationMode;
import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction;
import org.apache.ignite.cache.query.annotations.QuerySqlField;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.BinaryConfiguration;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.DataRegionConfiguration;
@@ -120,7 +121,7 @@ public class IgniteWalRecoverySeveralRestartsTest extends GridCommonAbstractTest
try {
IgniteEx ignite = startGrid(1);
- ignite.active(true);
+ ignite.cluster().state(ClusterState.ACTIVE);
Random locRandom = ThreadLocalRandom.current();
@@ -143,7 +144,7 @@ public class IgniteWalRecoverySeveralRestartsTest extends GridCommonAbstractTest
ignite = startGrid(1);
- ignite.active(true);
+ ignite.cluster().state(ClusterState.ACTIVE);
IgniteCache<Integer, IndexedObject> cache = ignite.cache(cacheName);
@@ -179,7 +180,7 @@ public class IgniteWalRecoverySeveralRestartsTest extends GridCommonAbstractTest
try {
IgniteEx ignite = startGrid(1);
- ignite.active(true);
+ ignite.cluster().state(ClusterState.ACTIVE);
CacheConfiguration<Integer, IndexedObject> dynCacheCfg = new CacheConfiguration<>();
@@ -210,7 +211,7 @@ public class IgniteWalRecoverySeveralRestartsTest extends GridCommonAbstractTest
ignite = startGrid(1);
- ignite.active(true);
+ ignite.cluster().state(ClusterState.ACTIVE);
ThreadLocalRandom locRandom = ThreadLocalRandom.current();
@@ -236,7 +237,7 @@ public class IgniteWalRecoverySeveralRestartsTest extends GridCommonAbstractTest
try {
IgniteEx ignite = startGrid(1);
- ignite.active(true);
+ ignite.cluster().state(ClusterState.ACTIVE);
CacheConfiguration<Integer, IndexedObject> dynCacheCfg = new CacheConfiguration<>();
@@ -273,7 +274,7 @@ public class IgniteWalRecoverySeveralRestartsTest extends GridCommonAbstractTest
ignite = startGrid(1);
- ignite.active(true);
+ ignite.cluster().state(ClusterState.ACTIVE);
ThreadLocalRandom locRandom = ThreadLocalRandom.current();
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalReplayingAfterRestartTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalReplayingAfterRestartTest.java
index 172857615f5..98289ba671a 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalReplayingAfterRestartTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalReplayingAfterRestartTest.java
@@ -24,6 +24,7 @@ import org.apache.ignite.IgniteCache;
import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.CacheRebalanceMode;
import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.DataRegionConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
@@ -121,7 +122,7 @@ public class IgniteWalReplayingAfterRestartTest extends GridCommonAbstractTest {
public void testWalRecordsAfterRestart() throws Exception {
IgniteEx ignite = startGrid(0);
- ignite.cluster().active(true);
+ ignite.cluster().state(ClusterState.ACTIVE);
IgniteCache<Integer, byte[]> cache = ignite.getOrCreateCache(CACHE_NAME);
@@ -142,7 +143,7 @@ public class IgniteWalReplayingAfterRestartTest extends GridCommonAbstractTest {
// There are no exceptions should be thrown here.
ignite = startGrid(0);
- ignite.cluster().active();
+ ignite.cluster().state().active();
// delta records should always follow PageSnapshot records.
String workDir = U.defaultWorkDirectory();
@@ -188,7 +189,7 @@ public class IgniteWalReplayingAfterRestartTest extends GridCommonAbstractTest {
IgniteEx ignite = startGrid(0);
- ignite.cluster().active(true);
+ ignite.cluster().state(ClusterState.ACTIVE);
IgniteCache<Object, Object> cache = ignite.getOrCreateCache(DEFAULT_CACHE_NAME);
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalSerializerVersionTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalSerializerVersionTest.java
index 5a7739ac287..c5183f71cef 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalSerializerVersionTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalSerializerVersionTest.java
@@ -22,6 +22,7 @@ import java.util.Collections;
import java.util.Iterator;
import java.util.List;
import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.DataRegionConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
@@ -237,7 +238,7 @@ public class IgniteWalSerializerVersionTest extends GridCommonAbstractTest {
IgniteEx ig0 = (IgniteEx)startGrid();
- ig0.cluster().active(true);
+ ig0.cluster().state(ClusterState.ACTIVE);
IgniteWriteAheadLogManager wal = ig0.context().cache().context().wal();
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/WalCompactionNoArchiverTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/WalCompactionNoArchiverTest.java
index 4c50e252fd4..da30f954c88 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/WalCompactionNoArchiverTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/WalCompactionNoArchiverTest.java
@@ -18,6 +18,7 @@ package org.apache.ignite.internal.processors.cache.persistence.db.wal;
import org.apache.ignite.IgniteCache;
import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.DataRegionConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
@@ -95,7 +96,7 @@ public class WalCompactionNoArchiverTest extends GridCommonAbstractTest {
@WithSystemProperty(key = "IGNITE_WAL_COMPRESSOR_WORKER_THREAD_CNT", value = "1")
public void testNoCompressionErrors() throws Exception {
IgniteEx ig = startGrid(0);
- ig.cluster().active(true);
+ ig.cluster().state(ClusterState.ACTIVE);
IgniteCache<Integer, byte[]> cache = ig.cache(CACHE_NAME);
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/WalCompactionSwitchOnTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/WalCompactionSwitchOnTest.java
index 70183ae1513..f24d75bc6ed 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/WalCompactionSwitchOnTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/WalCompactionSwitchOnTest.java
@@ -21,6 +21,7 @@ import java.io.File;
import java.io.FileFilter;
import org.apache.ignite.IgniteCache;
import org.apache.ignite.cache.CacheMode;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.DataRegionConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
@@ -70,7 +71,7 @@ public class WalCompactionSwitchOnTest extends GridCommonAbstractTest {
public void testWalCompactionSwitch() throws Exception {
IgniteEx ex = startGrid(0);
- ex.cluster().active(true);
+ ex.cluster().state(ClusterState.ACTIVE);
IgniteCache<Integer, Integer> cache = ex.getOrCreateCache(
new CacheConfiguration<Integer, Integer>()
@@ -108,7 +109,7 @@ public class WalCompactionSwitchOnTest extends GridCommonAbstractTest {
ex = startGrid(0);
- ex.cluster().active(true);
+ ex.cluster().state(ClusterState.ACTIVE);
File archiveDir = U.resolveWorkDirectory(
ex.configuration().getWorkDirectory(),
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/WalCompactionTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/WalCompactionTest.java
index 682ac0b1a1a..4fec9ef585a 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/WalCompactionTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/WalCompactionTest.java
@@ -30,6 +30,7 @@ import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.CacheWriteSynchronizationMode;
import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.DataRegionConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
@@ -163,7 +164,7 @@ public class WalCompactionTest extends GridCommonAbstractTest {
IgniteEx ig = (IgniteEx)startGrids(3);
ig.cluster().baselineAutoAdjustEnabled(false);
- ig.cluster().active(true);
+ ig.cluster().state(ClusterState.ACTIVE);
IgniteCache<Integer, byte[]> cache = ig.cache(CACHE_NAME);
@@ -258,7 +259,7 @@ public class WalCompactionTest extends GridCommonAbstractTest {
Ignite ignite = startGrids(2);
- ignite.cluster().active(true);
+ ignite.cluster().state(ClusterState.ACTIVE);
resetBaselineTopology();
@@ -298,7 +299,7 @@ public class WalCompactionTest extends GridCommonAbstractTest {
IgniteEx ig = (IgniteEx)startGrid(getTestIgniteInstanceName(0), optimize(icfg), null);
- ig.cluster().active(true);
+ ig.cluster().state(ClusterState.ACTIVE);
IgniteCache<Integer, byte[]> cache = ig.cache(CACHE_NAME);
@@ -360,7 +361,7 @@ public class WalCompactionTest extends GridCommonAbstractTest {
compactionEnabled = false;
IgniteEx ig = startGrid(0);
- ig.cluster().active(true);
+ ig.cluster().state(ClusterState.ACTIVE);
IgniteCache<Integer, byte[]> cache = ig.cache(CACHE_NAME);
@@ -408,7 +409,7 @@ public class WalCompactionTest extends GridCommonAbstractTest {
compactionEnabled = true;
ig = startGrid(0);
- ig.cluster().active(true);
+ ig.cluster().state(ClusterState.ACTIVE);
// Allow compressor to compress WAL segments.
assertTrue(GridTestUtils.waitForCondition(zippedWalSegment::exists, 15_000));
@@ -450,7 +451,7 @@ public class WalCompactionTest extends GridCommonAbstractTest {
@Test
public void testSeekingStartInCompactedSegment() throws Exception {
IgniteEx ig = startGrids(3);
- ig.cluster().active(true);
+ ig.cluster().state(ClusterState.ACTIVE);
IgniteCache<Integer, byte[]> cache = ig.cache(CACHE_NAME);
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/WalRebalanceRestartTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/WalRebalanceRestartTest.java
index 4432c583527..88d0878bead 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/WalRebalanceRestartTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/WalRebalanceRestartTest.java
@@ -24,6 +24,7 @@ import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteDataStreamer;
import org.apache.ignite.IgniteSystemProperties;
import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.DataRegionConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
@@ -229,7 +230,7 @@ public class WalRebalanceRestartTest extends GridCommonAbstractTest {
private void restartRebalance(RebalanceRetrigger retrigger, boolean retriggerAsHistorical) throws Exception {
IgniteEx ignite0 = startGrids(4);
- ignite0.cluster().active(true);
+ ignite0.cluster().state(ClusterState.ACTIVE);
try (IgniteDataStreamer streamer = ignite0.dataStreamer(DEFAULT_CACHE_NAME)) {
streamer.allowOverwrite(true);
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/WalRecoveryTxLogicalRecordsTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/WalRecoveryTxLogicalRecordsTest.java
index eaea64bb3db..c1ba599e090 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/WalRecoveryTxLogicalRecordsTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/WalRecoveryTxLogicalRecordsTest.java
@@ -39,6 +39,7 @@ import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction;
import org.apache.ignite.cache.query.QueryCursor;
import org.apache.ignite.cache.query.SqlFieldsQuery;
import org.apache.ignite.cache.query.annotations.QuerySqlField;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.BinaryConfiguration;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.DataRegionConfiguration;
@@ -166,7 +167,7 @@ public class WalRecoveryTxLogicalRecordsTest extends GridCommonAbstractTest {
public void testWalTxSimple() throws Exception {
Ignite ignite = startGrid();
- ignite.cluster().active(true);
+ ignite.cluster().state(ClusterState.ACTIVE);
GridCacheDatabaseSharedManager dbMgr = (GridCacheDatabaseSharedManager)((IgniteEx)ignite).context()
.cache().context().database();
@@ -203,7 +204,7 @@ public class WalRecoveryTxLogicalRecordsTest extends GridCommonAbstractTest {
ignite = startGrid();
- ignite.cluster().active(true);
+ ignite.cluster().state(ClusterState.ACTIVE);
cache = ignite.cache(CACHE_NAME);
@@ -237,7 +238,7 @@ public class WalRecoveryTxLogicalRecordsTest extends GridCommonAbstractTest {
public void testWalRecoveryRemoves() throws Exception {
Ignite ignite = startGrid();
- ignite.cluster().active(true);
+ ignite.cluster().state(ClusterState.ACTIVE);
GridCacheDatabaseSharedManager dbMgr = (GridCacheDatabaseSharedManager)((IgniteEx)ignite).context()
.cache().context().database();
@@ -287,7 +288,7 @@ public class WalRecoveryTxLogicalRecordsTest extends GridCommonAbstractTest {
ignite = startGrid();
- ignite.cluster().active(true);
+ ignite.cluster().state(ClusterState.ACTIVE);
cache = ignite.cache(CACHE_NAME);
@@ -325,7 +326,7 @@ public class WalRecoveryTxLogicalRecordsTest extends GridCommonAbstractTest {
Ignite ignite = startGrid();
- ignite.cluster().active(true);
+ ignite.cluster().state(ClusterState.ACTIVE);
GridCacheDatabaseSharedManager dbMgr = (GridCacheDatabaseSharedManager)((IgniteEx)ignite).context()
.cache().context().database();
@@ -420,7 +421,7 @@ public class WalRecoveryTxLogicalRecordsTest extends GridCommonAbstractTest {
// Check that iterator is valid after restart.
ignite = startGrid();
- ignite.cluster().active(true);
+ ignite.cluster().state(ClusterState.ACTIVE);
grp = ((IgniteEx)ignite).context().cache().cacheGroup(CU.cacheId(CACHE_NAME));
offh = grp.offheap();
@@ -498,7 +499,7 @@ public class WalRecoveryTxLogicalRecordsTest extends GridCommonAbstractTest {
public void testWalAfterPreloading() throws Exception {
Ignite ignite = startGrid();
- ignite.cluster().active(true);
+ ignite.cluster().state(ClusterState.ACTIVE);
GridCacheDatabaseSharedManager dbMgr = (GridCacheDatabaseSharedManager)((IgniteEx)ignite).context()
.cache().context().database();
@@ -521,7 +522,7 @@ public class WalRecoveryTxLogicalRecordsTest extends GridCommonAbstractTest {
ignite = startGrid();
- ignite.cluster().active(true);
+ ignite.cluster().state(ClusterState.ACTIVE);
cache = ignite.cache(CACHE_NAME);
@@ -575,7 +576,7 @@ public class WalRecoveryTxLogicalRecordsTest extends GridCommonAbstractTest {
Ignite ignite = startGrid(0);
- ignite.cluster().active(true);
+ ignite.cluster().state(ClusterState.ACTIVE);
GridCacheDatabaseSharedManager dbMgr = (GridCacheDatabaseSharedManager)((IgniteEx)ignite).context()
.cache().context().database();
@@ -611,7 +612,7 @@ public class WalRecoveryTxLogicalRecordsTest extends GridCommonAbstractTest {
ignite = startGrid(0);
- ignite.cluster().active(true);
+ ignite.cluster().state(ClusterState.ACTIVE);
ignite.cache(CACHE_NAME).put(1, new IndexedValue(0));
}
@@ -651,7 +652,7 @@ public class WalRecoveryTxLogicalRecordsTest extends GridCommonAbstractTest {
Ignite ignite = startGrid(0);
- ignite.cluster().active(true);
+ ignite.cluster().state(ClusterState.ACTIVE);
if (pages != null) {
List<Integer> curPags = allocatedPages(ignite, CACHE2_NAME);
@@ -704,7 +705,7 @@ public class WalRecoveryTxLogicalRecordsTest extends GridCommonAbstractTest {
Ignite ignite = startGrid(0);
- ignite.cluster().active(true);
+ ignite.cluster().state(ClusterState.ACTIVE);
GridCacheDatabaseSharedManager dbMgr = (GridCacheDatabaseSharedManager)((IgniteEx)ignite).context()
.cache().context().database();
@@ -787,7 +788,7 @@ public class WalRecoveryTxLogicalRecordsTest extends GridCommonAbstractTest {
Ignite ignite = startGrid(0);
- ignite.cluster().active(true);
+ ignite.cluster().state(ClusterState.ACTIVE);
IgniteCache<Integer, IndexedValue> cache1 = ignite.cache(CACHE_NAME);
IgniteCache<Object, Object> cache2 = ignite.cache(CACHE2_NAME);
@@ -823,7 +824,7 @@ public class WalRecoveryTxLogicalRecordsTest extends GridCommonAbstractTest {
ignite = startGrid(0);
- ignite.cluster().active(true);
+ ignite.cluster().state(ClusterState.ACTIVE);
cache1 = ignite.cache(CACHE_NAME);
cache2 = ignite.cache(CACHE2_NAME);
@@ -879,7 +880,7 @@ public class WalRecoveryTxLogicalRecordsTest extends GridCommonAbstractTest {
public void testWalIteratorOverPartitionWithMissingEntries() throws Exception {
Ignite ignite = startGrid();
- ignite.cluster().active(true);
+ ignite.cluster().state(ClusterState.ACTIVE);
awaitPartitionMapExchange();
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/WalRolloverRecordLoggingTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/WalRolloverRecordLoggingTest.java
index 93741fb5118..d85c82f27e4 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/WalRolloverRecordLoggingTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/WalRolloverRecordLoggingTest.java
@@ -20,6 +20,7 @@ package org.apache.ignite.internal.processors.cache.persistence.db.wal;
import java.util.concurrent.ThreadLocalRandom;
import org.apache.ignite.IgniteCache;
import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.DataRegionConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
@@ -91,7 +92,7 @@ public abstract class WalRolloverRecordLoggingTest extends GridCommonAbstractTes
public void testAvoidInfinityWaitingOnRolloverOfSegment() throws Exception {
IgniteEx ig = startGrid(0);
- ig.cluster().active(true);
+ ig.cluster().state(ClusterState.ACTIVE);
IgniteCache<Integer, Integer> cache = ig.getOrCreateCache(DEFAULT_CACHE_NAME);
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/WalRolloverTypesTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/WalRolloverTypesTest.java
index 805554d1008..a8fd71249ca 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/WalRolloverTypesTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/WalRolloverTypesTest.java
@@ -19,6 +19,7 @@ package org.apache.ignite.internal.processors.cache.persistence.db.wal;
import java.util.concurrent.ThreadLocalRandom;
import org.apache.ignite.IgniteCache;
import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.DataRegionConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
@@ -146,7 +147,7 @@ public class WalRolloverTypesTest extends GridCommonAbstractTest {
IgniteEx ig = startGrid(0);
- ig.cluster().active(true);
+ ig.cluster().state(ClusterState.ACTIVE);
IgniteWriteAheadLogManager walMgr = ig.context().cache().context().wal();
@@ -169,7 +170,7 @@ public class WalRolloverTypesTest extends GridCommonAbstractTest {
IgniteEx ig = startGrid(0);
- ig.cluster().active(true);
+ ig.cluster().state(ClusterState.ACTIVE);
IgniteWriteAheadLogManager walMgr = ig.context().cache().context().wal();
@@ -218,7 +219,7 @@ public class WalRolloverTypesTest extends GridCommonAbstractTest {
IgniteEx ig = startGrid(0);
- ig.cluster().active(true);
+ ig.cluster().state(ClusterState.ACTIVE);
IgniteCache<Integer, Integer> cache = ig.getOrCreateCache(DEFAULT_CACHE_NAME);
@@ -305,7 +306,7 @@ public class WalRolloverTypesTest extends GridCommonAbstractTest {
IgniteEx ig = startGrid(0);
- ig.cluster().active(true);
+ ig.cluster().state(ClusterState.ACTIVE);
IgniteCache<Integer, Integer> cache = ig.getOrCreateCache(DEFAULT_CACHE_NAME);
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/crc/IgniteAbstractWalIteratorInvalidCrcTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/crc/IgniteAbstractWalIteratorInvalidCrcTest.java
index 4ee015b0754..fc4452c75c0 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/crc/IgniteAbstractWalIteratorInvalidCrcTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/crc/IgniteAbstractWalIteratorInvalidCrcTest.java
@@ -25,6 +25,7 @@ import java.util.function.BiFunction;
import org.apache.ignite.IgniteCache;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.IgniteException;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.DataRegionConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
@@ -89,7 +90,7 @@ public abstract class IgniteAbstractWalIteratorInvalidCrcTest extends GridCommon
ignite = (IgniteEx)startGrid();
- ignite.cluster().active(true);
+ ignite.cluster().state(ClusterState.ACTIVE);
IgniteCache<Integer, byte[]> cache = ignite.cache(DEFAULT_CACHE_NAME);
@@ -103,7 +104,7 @@ public abstract class IgniteAbstractWalIteratorInvalidCrcTest extends GridCommon
for (int i = 0; i < insertingCnt; i++)
cache.put(i, val);
- ignite.cluster().active(false);
+ ignite.cluster().state(ClusterState.INACTIVE);
}
/** {@inheritDoc} */
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/crc/IgniteWithoutArchiverWalIteratorInvalidCrcTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/crc/IgniteWithoutArchiverWalIteratorInvalidCrcTest.java
index d1ea7085ed5..0360c977552 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/crc/IgniteWithoutArchiverWalIteratorInvalidCrcTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/crc/IgniteWithoutArchiverWalIteratorInvalidCrcTest.java
@@ -22,6 +22,7 @@ import java.util.List;
import java.util.Random;
import java.util.stream.Collectors;
import org.apache.ignite.IgniteCache;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.DataRegionConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
@@ -122,7 +123,7 @@ public class IgniteWithoutArchiverWalIteratorInvalidCrcTest extends GridCommonAb
IgniteEx ex = startGrid(0);
- ex.cluster().active(true);
+ ex.cluster().state(ClusterState.ACTIVE);
}
/**
@@ -193,7 +194,7 @@ public class IgniteWithoutArchiverWalIteratorInvalidCrcTest extends GridCommonAb
private void startNodeAndPopulate() throws Exception {
ignite = startGrid(0);
- ignite.cluster().active(true);
+ ignite.cluster().state(ClusterState.ACTIVE);
IgniteCache<Integer, byte[]> cache = ignite.cache(DEFAULT_CACHE_NAME);
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/reader/IgniteWalReaderTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/reader/IgniteWalReaderTest.java
index 2b281ef4dda..af1c8e27f34 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/reader/IgniteWalReaderTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/reader/IgniteWalReaderTest.java
@@ -221,7 +221,7 @@ public class IgniteWalReaderTest extends GridCommonAbstractTest {
Ignite ignite0 = startGrid();
- ignite0.cluster().active(true);
+ ignite0.cluster().state(ClusterState.ACTIVE);
Serializable consistentId = (Serializable)ignite0.cluster().localNode().consistentId();
@@ -343,7 +343,7 @@ public class IgniteWalReaderTest extends GridCommonAbstractTest {
Ignite ignite = startGrid();
- ignite.cluster().active(true);
+ ignite.cluster().state(ClusterState.ACTIVE);
final IgniteEvents evts = ignite.events();
@@ -455,7 +455,7 @@ public class IgniteWalReaderTest extends GridCommonAbstractTest {
Ignite ignite = startGrid();
- ignite.cluster().active(true);
+ ignite.cluster().state(ClusterState.ACTIVE);
IgniteEvents evts = ignite.events();
@@ -500,7 +500,7 @@ public class IgniteWalReaderTest extends GridCommonAbstractTest {
Ignite ignite = startGrid();
- ignite.cluster().active(true);
+ ignite.cluster().state(ClusterState.ACTIVE);
final IgniteEvents evts = ignite.events();
@@ -581,7 +581,7 @@ public class IgniteWalReaderTest extends GridCommonAbstractTest {
public void testTxFillWalAndExtractDataRecords() throws Exception {
Ignite ignite0 = startGrid();
- ignite0.cluster().active(true);
+ ignite0.cluster().state(ClusterState.ACTIVE);
int cntEntries = 1000;
int txCnt = 100;
@@ -683,7 +683,7 @@ public class IgniteWalReaderTest extends GridCommonAbstractTest {
public void testFillWalWithDifferentTypes() throws Exception {
Ignite ig = startGrid();
- ig.cluster().active(true);
+ ig.cluster().state(ClusterState.ACTIVE);
IgniteCache<Object, Object> addlCache = ig.getOrCreateCache(CACHE_ADDL_NAME);
@@ -885,9 +885,9 @@ public class IgniteWalReaderTest extends GridCommonAbstractTest {
Ignite ignite = startGrid();
- ignite.cluster().active(true);
+ ignite.cluster().state(ClusterState.ACTIVE);
- ignite.cluster().active(false);
+ ignite.cluster().state(ClusterState.INACTIVE);
final String subfolderName = genDbSubfolderName(ignite, 0);
@@ -918,7 +918,7 @@ public class IgniteWalReaderTest extends GridCommonAbstractTest {
public void testIteratorWithCurrentKernelContext() throws Exception {
IgniteEx ignite = startGrid(0);
- ignite.cluster().active(true);
+ ignite.cluster().state(ClusterState.ACTIVE);
int cntEntries = 100;
@@ -1027,11 +1027,11 @@ public class IgniteWalReaderTest extends GridCommonAbstractTest {
private void runRemoveOperationTest(CacheAtomicityMode mode) throws Exception {
Ignite ignite = startGrid();
- ignite.cluster().active(true);
+ ignite.cluster().state(ClusterState.ACTIVE);
createCache2(ignite, mode);
- ignite.cluster().active(false);
+ ignite.cluster().state(ClusterState.INACTIVE);
String subfolderName = genDbSubfolderName(ignite, 0);
@@ -1125,7 +1125,7 @@ public class IgniteWalReaderTest extends GridCommonAbstractTest {
cache.putAll(map);
- ignite.cluster().active(false);
+ ignite.cluster().state(ClusterState.INACTIVE);
String subfolderName1 = genDbSubfolderName(ignite, 0);
String subfolderName2 = genDbSubfolderName(ignite1, 1);
@@ -1289,7 +1289,7 @@ public class IgniteWalReaderTest extends GridCommonAbstractTest {
Ignite ignite = startGrid("node0");
Ignite ignite1 = startGrid(1);
- ignite.cluster().active(true);
+ ignite.cluster().state(ClusterState.ACTIVE);
Map<Object, IndexedObject> map = new TreeMap<>();
@@ -1300,7 +1300,7 @@ public class IgniteWalReaderTest extends GridCommonAbstractTest {
ignite.cache(CACHE_NAME).putAll(map);
- ignite.cluster().active(false);
+ ignite.cluster().state(ClusterState.INACTIVE);
String subfolderName1 = genDbSubfolderName(ignite, 0);
String subfolderName2 = genDbSubfolderName(ignite1, 1);
@@ -1426,7 +1426,7 @@ public class IgniteWalReaderTest extends GridCommonAbstractTest {
public void testCheckBoundsIterator() throws Exception {
Ignite ignite = startGrid("node0");
- ignite.cluster().active(true);
+ ignite.cluster().state(ClusterState.ACTIVE);
try (IgniteDataStreamer<Integer, IndexedObject> st = ignite.dataStreamer(CACHE_NAME)) {
st.allowOverwrite(true);
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/freelist/FreeListCachingTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/freelist/FreeListCachingTest.java
index 47d777e6022..a87abcead92 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/freelist/FreeListCachingTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/freelist/FreeListCachingTest.java
@@ -27,6 +27,7 @@ import org.apache.ignite.IgniteCache;
import org.apache.ignite.IgniteDataStreamer;
import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.DataRegionConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
@@ -88,7 +89,7 @@ public class FreeListCachingTest extends GridCommonAbstractTest {
public void testFreeListCaching() throws Exception {
IgniteEx ignite = startGrid(0);
- ignite.cluster().active(true);
+ ignite.cluster().state(ClusterState.ACTIVE);
int partCnt = 10;
@@ -231,7 +232,7 @@ public class FreeListCachingTest extends GridCommonAbstractTest {
public void testPageListCacheLimit() throws Exception {
IgniteEx ignite = startGrid(0);
- ignite.cluster().active(true);
+ ignite.cluster().state(ClusterState.ACTIVE);
ignite.getOrCreateCache("cache1");
ignite.getOrCreateCache("cache2");
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/metastorage/IgniteMetaStorageBasicTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/metastorage/IgniteMetaStorageBasicTest.java
index dadabc76ced..c6f4f4234f7 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/metastorage/IgniteMetaStorageBasicTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/metastorage/IgniteMetaStorageBasicTest.java
@@ -30,6 +30,7 @@ import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.DataRegionConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
@@ -87,7 +88,7 @@ public class IgniteMetaStorageBasicTest extends GridCommonAbstractTest {
public void testMetaStorageMassivePutFixed() throws Exception {
IgniteEx ig = startGrid(0);
- ig.cluster().active(true);
+ ig.cluster().state(ClusterState.ACTIVE);
IgniteCacheDatabaseSharedManager db = ig.context().cache().context().database();
@@ -125,7 +126,7 @@ public class IgniteMetaStorageBasicTest extends GridCommonAbstractTest {
public void testMetaStorageMassivePutRandom() throws Exception {
IgniteEx ig = startGrid(0);
- ig.cluster().active(true);
+ ig.cluster().state(ClusterState.ACTIVE);
IgniteCacheDatabaseSharedManager db = ig.context().cache().context().database();
@@ -189,7 +190,7 @@ public class IgniteMetaStorageBasicTest extends GridCommonAbstractTest {
try {
IgniteEx ig = startGrid(0);
- ig.cluster().active(true);
+ ig.cluster().state(ClusterState.ACTIVE);
IgniteCacheDatabaseSharedManager db = ig.context().cache().context().database();
@@ -229,7 +230,7 @@ public class IgniteMetaStorageBasicTest extends GridCommonAbstractTest {
ig = (IgniteEx)startGrid(getTestIgniteInstanceName(0), optimize(cfg), null);
- ig.cluster().active(true);
+ ig.cluster().state(ClusterState.ACTIVE);
db = ig.context().cache().context().database();
@@ -252,7 +253,7 @@ public class IgniteMetaStorageBasicTest extends GridCommonAbstractTest {
ig = startGrid(0);
- ig.cluster().active(true);
+ ig.cluster().state(ClusterState.ACTIVE);
db = ig.context().cache().context().database();
@@ -299,7 +300,7 @@ public class IgniteMetaStorageBasicTest extends GridCommonAbstractTest {
try {
IgniteEx ig = startGrid(0);
- ig.cluster().active(true);
+ ig.cluster().state(ClusterState.ACTIVE);
IgniteCacheDatabaseSharedManager db = ig.context().cache().context().database();
@@ -323,7 +324,7 @@ public class IgniteMetaStorageBasicTest extends GridCommonAbstractTest {
ig = startGrid(0);
- ig.cluster().active(true);
+ ig.cluster().state(ClusterState.ACTIVE);
db = ig.context().cache().context().database();
@@ -431,7 +432,7 @@ public class IgniteMetaStorageBasicTest extends GridCommonAbstractTest {
public void testMetaStorageMassivePutUpdateRestart() throws Exception {
IgniteEx ig = startGrid(0);
- ig.cluster().active(true);
+ ig.cluster().state(ClusterState.ACTIVE);
final byte KEYS_CNT = 100;
final String KEY_PREFIX = "test.key.";
@@ -444,7 +445,7 @@ public class IgniteMetaStorageBasicTest extends GridCommonAbstractTest {
ig = startGrid(0);
- ig.cluster().active(true);
+ ig.cluster().state(ClusterState.ACTIVE);
verifyKeys(ig, KEYS_CNT, KEY_PREFIX, UPDATED_VAL_PREFIX);
}
@@ -456,7 +457,7 @@ public class IgniteMetaStorageBasicTest extends GridCommonAbstractTest {
public void testRecoveryOfMetastorageWhenNodeNotInBaseline() throws Exception {
IgniteEx ig0 = startGrid(0);
- ig0.cluster().active(true);
+ ig0.cluster().state(ClusterState.ACTIVE);
final byte KEYS_CNT = 100;
final String KEY_PREFIX = "test.key.";
@@ -485,7 +486,7 @@ public class IgniteMetaStorageBasicTest extends GridCommonAbstractTest {
public void testReadOnlyIterationOrder() throws Exception {
IgniteEx ignite = startGrid(0);
- ignite.cluster().active(true);
+ ignite.cluster().state(ClusterState.ACTIVE);
MetaStorage storage = ignite.context().cache().context().database().metaStorage();
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/PageMemoryLazyAllocationTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/PageMemoryLazyAllocationTest.java
index 24386e53c6d..3ba22a31e3c 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/PageMemoryLazyAllocationTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/PageMemoryLazyAllocationTest.java
@@ -20,6 +20,7 @@ package org.apache.ignite.internal.processors.cache.persistence.pagemem;
import org.apache.ignite.IgniteCache;
import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.DataRegionConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
@@ -221,7 +222,7 @@ public class PageMemoryLazyAllocationTest extends GridCommonAbstractTest {
IgniteEx srv0 = startGrid(0);
IgniteEx srv1 = startGrid(1);
- srv0.cluster().active(true);
+ srv0.cluster().state(ClusterState.ACTIVE);
awaitPartitionMapExchange();
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/PageMemoryLazyAllocationWithPDSTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/PageMemoryLazyAllocationWithPDSTest.java
index 71c19137749..25ccb5b3b61 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/PageMemoryLazyAllocationWithPDSTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/PageMemoryLazyAllocationWithPDSTest.java
@@ -18,6 +18,7 @@
package org.apache.ignite.internal.processors.cache.persistence.pagemem;
import org.apache.ignite.IgniteCache;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.DataRegionConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.failure.StopNodeFailureHandler;
@@ -76,7 +77,7 @@ public class PageMemoryLazyAllocationWithPDSTest extends PageMemoryLazyAllocatio
startGrid(cfgWithHugeRegion("test-server-2"));
- srv.cluster().active(true);
+ srv.cluster().state(ClusterState.ACTIVE);
awaitPartitionMapExchange();
@@ -86,7 +87,7 @@ public class PageMemoryLazyAllocationWithPDSTest extends PageMemoryLazyAllocatio
startGrid(cfgWithHugeRegion("test-server-2"));
- srv.cluster().active(true);
+ srv.cluster().state(ClusterState.ACTIVE);
}
/** */
@@ -97,7 +98,7 @@ public class PageMemoryLazyAllocationWithPDSTest extends PageMemoryLazyAllocatio
IgniteEx srv = startGrid(cfgWithHugeRegion("test-server")
.setFailureHandler(new StopNodeFailureHandler()));
- srv.cluster().active(true);
+ srv.cluster().state(ClusterState.ACTIVE);
awaitPartitionMapExchange();
}
@@ -113,7 +114,7 @@ public class PageMemoryLazyAllocationWithPDSTest extends PageMemoryLazyAllocatio
IgniteEx clnt = startClientGrid(cfgWithHugeRegion("test-client")
.setFailureHandler(new StopNodeFailureHandler()));
- srv.cluster().active(true);
+ srv.cluster().state(ClusterState.ACTIVE);
awaitPartitionMapExchange();
}
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/PagesWriteThrottleSandboxTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/PagesWriteThrottleSandboxTest.java
index 9a890c54762..a0dd4f0e0d6 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/PagesWriteThrottleSandboxTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/PagesWriteThrottleSandboxTest.java
@@ -31,6 +31,7 @@ import org.apache.ignite.IgniteDataStreamer;
import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.CacheWriteSynchronizationMode;
import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.DataRegionConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
@@ -110,7 +111,7 @@ public class PagesWriteThrottleSandboxTest extends GridCommonAbstractTest {
*/
@Test
public void testThrottle() throws Exception {
- startGrids(1).active(true);
+ startGrids(1).cluster().state(ClusterState.ACTIVE);
try {
final Ignite ig = ignite(0);
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/PagesWriteThrottleSmokeTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/PagesWriteThrottleSmokeTest.java
index 19e74c3f1b5..30423759ed4 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/PagesWriteThrottleSmokeTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/PagesWriteThrottleSmokeTest.java
@@ -24,6 +24,7 @@ import org.apache.ignite.IgniteCache;
import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.CacheWriteSynchronizationMode;
import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.DataRegionConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
@@ -113,7 +114,7 @@ public class PagesWriteThrottleSmokeTest extends GridCommonAbstractTest {
*/
@Test
public void testThrottle() throws Exception {
- startGrids(2).active(true);
+ startGrids(2).cluster().state(ClusterState.ACTIVE);
try {
IgniteEx ig = ignite(0);
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/UsedPagesMetricAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/UsedPagesMetricAbstractTest.java
index 1a5032a2027..96c89f3826d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/UsedPagesMetricAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/UsedPagesMetricAbstractTest.java
@@ -19,6 +19,7 @@ package org.apache.ignite.internal.processors.cache.persistence.pagemem;
import org.apache.ignite.DataRegionMetrics;
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCache;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
/**
@@ -51,7 +52,7 @@ public class UsedPagesMetricAbstractTest extends GridCommonAbstractTest {
) throws Exception {
Ignite node = startGrids(nodeCnt);
- node.cluster().active(true);
+ node.cluster().state(ClusterState.ACTIVE);
IgniteCache<Long, Object> cache = node.getOrCreateCache(MY_CACHE);
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/AbstractNodeJoinTemplate.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/AbstractNodeJoinTemplate.java
index 0936244d786..5284bff49af 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/AbstractNodeJoinTemplate.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/AbstractNodeJoinTemplate.java
@@ -22,6 +22,7 @@ import java.util.Arrays;
import java.util.List;
import java.util.Map;
import org.apache.ignite.cache.CacheAtomicityMode;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.DataRegionConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
@@ -613,12 +614,12 @@ public abstract class AbstractNodeJoinTemplate extends GridCommonAbstractTest {
IgniteEx crd = grid(nodes.get(0));
for (IgniteEx ig : grids())
- assertEquals((boolean)state, ig.active());
+ assertEquals((boolean)state, ig.cluster().state().active());
if (!state) {
System.out.println(">>> Activate cluster");
- crd.active(true);
+ crd.cluster().state(ClusterState.ACTIVE);
System.out.println(">>> Check after cluster activated");
@@ -627,7 +628,7 @@ public abstract class AbstractNodeJoinTemplate extends GridCommonAbstractTest {
else {
System.out.println(">>> DeActivate cluster");
- crd.active(false);
+ crd.cluster().state(ClusterState.INACTIVE);
System.out.println(">>> Check after cluster deActivated");
@@ -635,7 +636,7 @@ public abstract class AbstractNodeJoinTemplate extends GridCommonAbstractTest {
System.out.println(">>> Activate cluster");
- crd.active(true);
+ crd.cluster().state(ClusterState.ACTIVE);
}
AffinityTopologyVersion next0Ver = nextMinorVersion(crd);
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/IgniteChangeGlobalStateAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/IgniteChangeGlobalStateAbstractTest.java
index 1cbcfb132d9..ddb6d48ecf1 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/IgniteChangeGlobalStateAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/IgniteChangeGlobalStateAbstractTest.java
@@ -23,6 +23,7 @@ import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ThreadLocalRandom;
import org.apache.ignite.Ignite;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.DataRegionConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
@@ -156,7 +157,7 @@ public abstract class IgniteChangeGlobalStateAbstractTest extends GridCommonAbst
startPrimary(i);
if (cnt > 0)
- grid("node0" + primarySuffix).active(true);
+ grid("node0" + primarySuffix).cluster().state(ClusterState.ACTIVE);
}
/**
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/IgniteChangeGlobalStateCacheTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/IgniteChangeGlobalStateCacheTest.java
index c8ae6e89f34..9bcfe9b7e2f 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/IgniteChangeGlobalStateCacheTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/IgniteChangeGlobalStateCacheTest.java
@@ -19,6 +19,7 @@ package org.apache.ignite.internal.processors.cache.persistence.standbycluster;
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCache;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.internal.IgniteEx;
import org.apache.ignite.internal.processors.cache.GridCacheProcessor;
@@ -50,7 +51,7 @@ public class IgniteChangeGlobalStateCacheTest extends IgniteChangeGlobalStateAbs
stopAllPrimary();
- ig1B.active(true);
+ ig1B.cluster().state(ClusterState.ACTIVE);
IgniteCache<String, String> cache1B = ig1B.cache(cacheName);
IgniteCache<String, String> cache2B = ig2B.cache(cacheName);
@@ -99,7 +100,7 @@ public class IgniteChangeGlobalStateCacheTest extends IgniteChangeGlobalStateAbs
stopAllPrimary();
- ig1B.active(true);
+ ig1B.cluster().state(ClusterState.ACTIVE);
IgniteCache<String, String> cache1B = ig1B.cache(cacheName);
IgniteCache<String, String> cache2B = ig2B.cache(cacheName);
@@ -134,11 +135,11 @@ public class IgniteChangeGlobalStateCacheTest extends IgniteChangeGlobalStateAbs
cacheExp.put("key", "value");
- assertTrue(ig1.active());
- assertTrue(ig2.active());
- assertTrue(ig3.active());
+ assertTrue(ig1.cluster().state().active());
+ assertTrue(ig2.cluster().state().active());
+ assertTrue(ig3.cluster().state().active());
- ig2.active(false);
+ ig2.cluster().state(ClusterState.INACTIVE);
IgniteEx ex1 = (IgniteEx)ig1;
IgniteEx ex2 = (IgniteEx)ig2;
@@ -152,15 +153,15 @@ public class IgniteChangeGlobalStateCacheTest extends IgniteChangeGlobalStateAbs
assertTrue(F.isEmpty(cache2.jcaches()));
assertTrue(F.isEmpty(cache3.jcaches()));
- assertTrue(!ig1.active());
- assertTrue(!ig2.active());
- assertTrue(!ig3.active());
+ assertTrue(!ig1.cluster().state().active());
+ assertTrue(!ig2.cluster().state().active());
+ assertTrue(!ig3.cluster().state().active());
- ig3.active(true);
+ ig3.cluster().state(ClusterState.ACTIVE);
- assertTrue(ig1.active());
- assertTrue(ig2.active());
- assertTrue(ig3.active());
+ assertTrue(ig1.cluster().state().active());
+ assertTrue(ig2.cluster().state().active());
+ assertTrue(ig3.cluster().state().active());
IgniteCache<String, String> cacheAct = ig2.cache(chName);
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/IgniteChangeGlobalStateDataStreamerTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/IgniteChangeGlobalStateDataStreamerTest.java
index e34beef5d39..ab0356cc2c0 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/IgniteChangeGlobalStateDataStreamerTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/IgniteChangeGlobalStateDataStreamerTest.java
@@ -20,6 +20,7 @@ package org.apache.ignite.internal.processors.cache.persistence.standbycluster;
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCache;
import org.apache.ignite.IgniteDataStreamer;
+import org.apache.ignite.cluster.ClusterState;
import org.junit.Test;
/**
@@ -49,13 +50,13 @@ public class IgniteChangeGlobalStateDataStreamerTest extends IgniteChangeGlobalS
Ignite ig2C = primaryClient(1);
Ignite ig3C = primaryClient(2);
- assertTrue(ig1.active());
- assertTrue(ig2.active());
- assertTrue(ig3.active());
+ assertTrue(ig1.cluster().state().active());
+ assertTrue(ig2.cluster().state().active());
+ assertTrue(ig3.cluster().state().active());
- assertTrue(ig1C.active());
- assertTrue(ig2C.active());
- assertTrue(ig3C.active());
+ assertTrue(ig1C.cluster().state().active());
+ assertTrue(ig2C.cluster().state().active());
+ assertTrue(ig3C.cluster().state().active());
String cacheName = "myStreamCache";
@@ -66,15 +67,15 @@ public class IgniteChangeGlobalStateDataStreamerTest extends IgniteChangeGlobalS
stmr.addData(i, Integer.toString(i));
}
- ig2C.active(false);
+ ig2C.cluster().state(ClusterState.INACTIVE);
- assertTrue(!ig1.active());
- assertTrue(!ig2.active());
- assertTrue(!ig3.active());
+ assertTrue(!ig1.cluster().state().active());
+ assertTrue(!ig2.cluster().state().active());
+ assertTrue(!ig3.cluster().state().active());
- assertTrue(!ig1C.active());
- assertTrue(!ig2C.active());
- assertTrue(!ig3C.active());
+ assertTrue(!ig1C.cluster().state().active());
+ assertTrue(!ig2C.cluster().state().active());
+ assertTrue(!ig3C.cluster().state().active());
boolean fail = false;
@@ -90,15 +91,15 @@ public class IgniteChangeGlobalStateDataStreamerTest extends IgniteChangeGlobalS
if (!fail)
fail("exception was not throw");
- ig3C.active(true);
+ ig3C.cluster().state(ClusterState.ACTIVE);
- assertTrue(ig1.active());
- assertTrue(ig2.active());
- assertTrue(ig3.active());
+ assertTrue(ig1.cluster().state().active());
+ assertTrue(ig2.cluster().state().active());
+ assertTrue(ig3.cluster().state().active());
- assertTrue(ig1C.active());
- assertTrue(ig2C.active());
- assertTrue(ig3C.active());
+ assertTrue(ig1C.cluster().state().active());
+ assertTrue(ig2C.cluster().state().active());
+ assertTrue(ig3C.cluster().state().active());
try (IgniteDataStreamer<Integer, String> stmr2 = ig2.dataStreamer(cacheName)) {
for (int i = 100; i < 200; i++)
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/IgniteChangeGlobalStateDataStructureTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/IgniteChangeGlobalStateDataStructureTest.java
index 6b7540d567d..d28f737e21e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/IgniteChangeGlobalStateDataStructureTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/IgniteChangeGlobalStateDataStructureTest.java
@@ -23,6 +23,7 @@ import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteAtomicLong;
import org.apache.ignite.IgniteAtomicSequence;
import org.apache.ignite.IgniteCountDownLatch;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.internal.IgniteEx;
import org.apache.ignite.internal.processors.cache.GridCacheProcessor;
import org.apache.ignite.internal.util.typedef.F;
@@ -54,11 +55,11 @@ public class IgniteChangeGlobalStateDataStructureTest extends IgniteChangeGlobal
lexp.incrementAndGet();
lexp.incrementAndGet();
- assertTrue(ig1.active());
- assertTrue(ig2.active());
- assertTrue(ig3.active());
+ assertTrue(ig1.cluster().state().active());
+ assertTrue(ig2.cluster().state().active());
+ assertTrue(ig3.cluster().state().active());
- ig2.active(false);
+ ig2.cluster().state(ClusterState.INACTIVE);
IgniteEx ex1 = (IgniteEx)ig1;
IgniteEx ex2 = (IgniteEx)ig2;
@@ -72,15 +73,15 @@ public class IgniteChangeGlobalStateDataStructureTest extends IgniteChangeGlobal
assertTrue(F.isEmpty(cache2.jcaches()));
assertTrue(F.isEmpty(cache3.jcaches()));
- assertTrue(!ig1.active());
- assertTrue(!ig2.active());
- assertTrue(!ig3.active());
+ assertTrue(!ig1.cluster().state().active());
+ assertTrue(!ig2.cluster().state().active());
+ assertTrue(!ig3.cluster().state().active());
- ig3.active(true);
+ ig3.cluster().state(ClusterState.ACTIVE);
- assertTrue(ig1.active());
- assertTrue(ig2.active());
- assertTrue(ig3.active());
+ assertTrue(ig1.cluster().state().active());
+ assertTrue(ig2.cluster().state().active());
+ assertTrue(ig3.cluster().state().active());
IgniteAtomicLong lact1 = ig1.atomicLong(lName, 0, false);
IgniteAtomicLong lact2 = ig2.atomicLong(lName, 0, false);
@@ -128,11 +129,11 @@ public class IgniteChangeGlobalStateDataStructureTest extends IgniteChangeGlobal
assertEquals(4, latchExp1.count());
- assertTrue(ig1.active());
- assertTrue(ig2.active());
- assertTrue(ig3.active());
+ assertTrue(ig1.cluster().state().active());
+ assertTrue(ig2.cluster().state().active());
+ assertTrue(ig3.cluster().state().active());
- ig2.active(false);
+ ig2.cluster().state(ClusterState.INACTIVE);
IgniteEx ex1 = (IgniteEx)ig1;
IgniteEx ex2 = (IgniteEx)ig2;
@@ -146,15 +147,15 @@ public class IgniteChangeGlobalStateDataStructureTest extends IgniteChangeGlobal
assertTrue(F.isEmpty(cache2.jcaches()));
assertTrue(F.isEmpty(cache3.jcaches()));
- assertTrue(!ig1.active());
- assertTrue(!ig2.active());
- assertTrue(!ig3.active());
+ assertTrue(!ig1.cluster().state().active());
+ assertTrue(!ig2.cluster().state().active());
+ assertTrue(!ig3.cluster().state().active());
- ig3.active(true);
+ ig3.cluster().state(ClusterState.ACTIVE);
- assertTrue(ig1.active());
- assertTrue(ig2.active());
- assertTrue(ig3.active());
+ assertTrue(ig1.cluster().state().active());
+ assertTrue(ig2.cluster().state().active());
+ assertTrue(ig3.cluster().state().active());
final IgniteCountDownLatch latchAct1 = ig1.countDownLatch(latchName, 0, false, false);
final IgniteCountDownLatch latchAct2 = ig2.countDownLatch(latchName, 0, false, false);
@@ -226,11 +227,11 @@ public class IgniteChangeGlobalStateDataStructureTest extends IgniteChangeGlobal
seqExp2.incrementAndGet();
seqExp3.incrementAndGet();
- assertTrue(ig1.active());
- assertTrue(ig2.active());
- assertTrue(ig3.active());
+ assertTrue(ig1.cluster().state().active());
+ assertTrue(ig2.cluster().state().active());
+ assertTrue(ig3.cluster().state().active());
- ig2.active(false);
+ ig2.cluster().state(ClusterState.INACTIVE);
IgniteEx ex1 = (IgniteEx)ig1;
IgniteEx ex2 = (IgniteEx)ig2;
@@ -244,15 +245,15 @@ public class IgniteChangeGlobalStateDataStructureTest extends IgniteChangeGlobal
assertTrue(F.isEmpty(cache2.jcaches()));
assertTrue(F.isEmpty(cache3.jcaches()));
- assertTrue(!ig1.active());
- assertTrue(!ig2.active());
- assertTrue(!ig3.active());
+ assertTrue(!ig1.cluster().state().active());
+ assertTrue(!ig2.cluster().state().active());
+ assertTrue(!ig3.cluster().state().active());
- ig3.active(true);
+ ig3.cluster().state(ClusterState.ACTIVE);
- assertTrue(ig1.active());
- assertTrue(ig2.active());
- assertTrue(ig3.active());
+ assertTrue(ig1.cluster().state().active());
+ assertTrue(ig2.cluster().state().active());
+ assertTrue(ig3.cluster().state().active());
IgniteAtomicSequence seqAct1 = ig1.atomicSequence(seqName, 0, false);
IgniteAtomicSequence seqAct2 = ig2.atomicSequence(seqName, 0, false);
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/IgniteChangeGlobalStateFailOverTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/IgniteChangeGlobalStateFailOverTest.java
index 2f7c1b2dc2b..537acfabb50 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/IgniteChangeGlobalStateFailOverTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/IgniteChangeGlobalStateFailOverTest.java
@@ -24,6 +24,7 @@ import java.util.concurrent.atomic.AtomicLong;
import java.util.concurrent.locks.ReentrantReadWriteLock;
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCache;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.internal.IgniteInternalFuture;
import org.junit.Test;
@@ -64,9 +65,9 @@ public class IgniteChangeGlobalStateFailOverTest extends IgniteChangeGlobalState
final Ignite igB2 = backUp(1);
final Ignite igB3 = backUp(2);
- assertTrue(!igB1.active());
- assertTrue(!igB2.active());
- assertTrue(!igB3.active());
+ assertTrue(!igB1.cluster().state().active());
+ assertTrue(!igB2.cluster().state().active());
+ assertTrue(!igB3.cluster().state().active());
final AtomicInteger cntA = new AtomicInteger();
final AtomicInteger cntD = new AtomicInteger();
@@ -87,14 +88,14 @@ public class IgniteChangeGlobalStateFailOverTest extends IgniteChangeGlobalState
if (canAct.get()) {
long start = System.currentTimeMillis();
- ig.active(true);
+ ig.cluster().state(ClusterState.ACTIVE);
timeA.addAndGet((System.currentTimeMillis() - start));
cntA.incrementAndGet();
for (Ignite ign : allBackUpNodes())
- assertTrue(ign.active());
+ assertTrue(ign.cluster().state().active());
canAct.set(false);
}
@@ -112,14 +113,14 @@ public class IgniteChangeGlobalStateFailOverTest extends IgniteChangeGlobalState
if (!canAct.get()) {
long start = System.currentTimeMillis();
- ig.active(false);
+ ig.cluster().state(ClusterState.INACTIVE);
timeD.addAndGet((System.currentTimeMillis() - start));
cntD.incrementAndGet();
for (Ignite ign : allBackUpNodes())
- assertTrue(!ign.active());
+ assertTrue(!ign.cluster().state().active());
canAct.set(true);
}
@@ -151,9 +152,9 @@ public class IgniteChangeGlobalStateFailOverTest extends IgniteChangeGlobalState
final Ignite igB2 = backUp(1);
final Ignite igB3 = backUp(2);
- assertTrue(!igB1.active());
- assertTrue(!igB2.active());
- assertTrue(!igB3.active());
+ assertTrue(!igB1.cluster().state().active());
+ assertTrue(!igB2.cluster().state().active());
+ assertTrue(!igB3.cluster().state().active());
final AtomicInteger cntA = new AtomicInteger();
final AtomicInteger cntD = new AtomicInteger();
@@ -178,14 +179,14 @@ public class IgniteChangeGlobalStateFailOverTest extends IgniteChangeGlobalState
long start = System.currentTimeMillis();
- ig.active(true);
+ ig.cluster().state(ClusterState.ACTIVE);
timeA.addAndGet((System.currentTimeMillis() - start));
cntA.incrementAndGet();
for (Ignite ign : allBackUpNodes())
- assertTrue(ign.active());
+ assertTrue(ign.cluster().state().active());
}
finally {
rwLock.readLock().unlock();
@@ -206,14 +207,14 @@ public class IgniteChangeGlobalStateFailOverTest extends IgniteChangeGlobalState
long start = System.currentTimeMillis();
- ig.active(false);
+ ig.cluster().state(ClusterState.INACTIVE);
timeD.addAndGet((System.currentTimeMillis() - start));
cntD.incrementAndGet();
for (Ignite ign : allBackUpNodes())
- assertTrue(!ign.active());
+ assertTrue(!ign.cluster().state().active());
}
finally {
rwLock.writeLock().unlock();
@@ -285,9 +286,9 @@ public class IgniteChangeGlobalStateFailOverTest extends IgniteChangeGlobalState
final Ignite igB2 = backUp(1);
final Ignite igB3 = backUp(2);
- assertTrue(!igB1.active());
- assertTrue(!igB2.active());
- assertTrue(!igB3.active());
+ assertTrue(!igB1.cluster().state().active());
+ assertTrue(!igB2.cluster().state().active());
+ assertTrue(!igB3.cluster().state().active());
final CacheConfiguration<String, String> ccfg = new CacheConfiguration<>();
ccfg.setName("main-cache");
@@ -313,7 +314,7 @@ public class IgniteChangeGlobalStateFailOverTest extends IgniteChangeGlobalState
if (canAct.get()) {
long start = System.currentTimeMillis();
- ig.active(true);
+ ig.cluster().state(ClusterState.ACTIVE);
IgniteCache<String, String> cache = ig.getOrCreateCache(ccfg);
@@ -326,7 +327,7 @@ public class IgniteChangeGlobalStateFailOverTest extends IgniteChangeGlobalState
cntA.incrementAndGet();
for (Ignite ign : allBackUpNodes())
- assertTrue(ign.active());
+ assertTrue(ign.cluster().state().active());
canAct.set(false);
}
@@ -349,14 +350,14 @@ public class IgniteChangeGlobalStateFailOverTest extends IgniteChangeGlobalState
for (int i = 0; i < cnt.get(); i++)
assertEquals("value" + i, cache.get("key" + i));
- ig.active(false);
+ ig.cluster().state(ClusterState.INACTIVE);
timeD.addAndGet((System.currentTimeMillis() - start));
cntD.incrementAndGet();
for (Ignite ign : allBackUpNodes())
- assertTrue(!ign.active());
+ assertTrue(!ign.cluster().state().active());
canAct.set(true);
}
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/IgniteChangeGlobalStateServiceTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/IgniteChangeGlobalStateServiceTest.java
index 58940b5adaa..dee6f19dfed 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/IgniteChangeGlobalStateServiceTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/IgniteChangeGlobalStateServiceTest.java
@@ -19,6 +19,7 @@ package org.apache.ignite.internal.processors.cache.persistence.standbycluster;
import java.util.Collection;
import org.apache.ignite.Ignite;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.internal.util.typedef.F;
import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.services.Service;
@@ -69,7 +70,7 @@ public class IgniteChangeGlobalStateServiceTest extends IgniteChangeGlobalStateA
stopAllPrimary();
- ig1B.active(true);
+ ig1B.cluster().state(ClusterState.ACTIVE);
U.sleep(3000);
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/IgniteChangeGlobalStateTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/IgniteChangeGlobalStateTest.java
index 946db4e2210..be03d76b06f 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/IgniteChangeGlobalStateTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/IgniteChangeGlobalStateTest.java
@@ -27,6 +27,7 @@ import org.apache.ignite.IgniteCache;
import org.apache.ignite.IgniteException;
import org.apache.ignite.IgniteServices;
import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.internal.IgniteEx;
import org.apache.ignite.internal.IgniteInternalFuture;
import org.apache.ignite.internal.processors.cache.GridCacheProcessor;
@@ -55,21 +56,21 @@ public class IgniteChangeGlobalStateTest extends IgniteChangeGlobalStateAbstract
Ignite ig2B = backUp(1);
Ignite ig3B = backUp(2);
- assertTrue(ig1P.active());
- assertTrue(ig2P.active());
- assertTrue(ig3P.active());
+ assertTrue(ig1P.cluster().state().active());
+ assertTrue(ig2P.cluster().state().active());
+ assertTrue(ig3P.cluster().state().active());
- assertTrue(!ig1B.active());
- assertTrue(!ig2B.active());
- assertTrue(!ig3B.active());
+ assertTrue(!ig1B.cluster().state().active());
+ assertTrue(!ig2B.cluster().state().active());
+ assertTrue(!ig3B.cluster().state().active());
stopAllPrimary();
- ig2B.active(true);
+ ig2B.cluster().state(ClusterState.ACTIVE);
- assertTrue(ig1B.active());
- assertTrue(ig2B.active());
- assertTrue(ig3B.active());
+ assertTrue(ig1B.cluster().state().active());
+ assertTrue(ig2B.cluster().state().active());
+ assertTrue(ig3B.cluster().state().active());
}
/**
@@ -89,29 +90,29 @@ public class IgniteChangeGlobalStateTest extends IgniteChangeGlobalStateAbstract
Ignite ig2C = backUpClient(1);
Ignite ig3C = backUpClient(2);
- assertTrue(ig1P.active());
- assertTrue(ig2P.active());
- assertTrue(ig3P.active());
+ assertTrue(ig1P.cluster().state().active());
+ assertTrue(ig2P.cluster().state().active());
+ assertTrue(ig3P.cluster().state().active());
- assertTrue(!ig1B.active());
- assertTrue(!ig2B.active());
- assertTrue(!ig3B.active());
+ assertTrue(!ig1B.cluster().state().active());
+ assertTrue(!ig2B.cluster().state().active());
+ assertTrue(!ig3B.cluster().state().active());
- assertTrue(!ig1C.active());
- assertTrue(!ig2C.active());
- assertTrue(!ig3C.active());
+ assertTrue(!ig1C.cluster().state().active());
+ assertTrue(!ig2C.cluster().state().active());
+ assertTrue(!ig3C.cluster().state().active());
stopAllPrimary();
- ig2B.active(true);
+ ig2B.cluster().state(ClusterState.ACTIVE);
- assertTrue(ig1B.active());
- assertTrue(ig2B.active());
- assertTrue(ig3B.active());
+ assertTrue(ig1B.cluster().state().active());
+ assertTrue(ig2B.cluster().state().active());
+ assertTrue(ig3B.cluster().state().active());
- assertTrue(ig1C.active());
- assertTrue(ig2C.active());
- assertTrue(ig3C.active());
+ assertTrue(ig1C.cluster().state().active());
+ assertTrue(ig2C.cluster().state().active());
+ assertTrue(ig3C.cluster().state().active());
}
/**
@@ -127,9 +128,9 @@ public class IgniteChangeGlobalStateTest extends IgniteChangeGlobalStateAbstract
final Ignite ig2C = backUpClient(1);
final Ignite ig3C = backUpClient(2);
- assertTrue(!ig1B.active());
- assertTrue(!ig2B.active());
- assertTrue(!ig3B.active());
+ assertTrue(!ig1B.cluster().state().active());
+ assertTrue(!ig2B.cluster().state().active());
+ assertTrue(!ig3B.cluster().state().active());
stopAllPrimary();
@@ -139,7 +140,7 @@ public class IgniteChangeGlobalStateTest extends IgniteChangeGlobalStateAbstract
@Override public Void call() throws Exception {
barrier.await();
- ig1B.active(true);
+ ig1B.cluster().state(ClusterState.ACTIVE);
return null;
}
@@ -149,7 +150,7 @@ public class IgniteChangeGlobalStateTest extends IgniteChangeGlobalStateAbstract
@Override public Void call() throws Exception {
barrier.await();
- ig2B.active(true);
+ ig2B.cluster().state(ClusterState.ACTIVE);
return null;
}
@@ -159,7 +160,7 @@ public class IgniteChangeGlobalStateTest extends IgniteChangeGlobalStateAbstract
@Override public Void call() throws Exception {
barrier.await();
- ig3B.active(true);
+ ig3B.cluster().state(ClusterState.ACTIVE);
return null;
}
@@ -169,7 +170,7 @@ public class IgniteChangeGlobalStateTest extends IgniteChangeGlobalStateAbstract
@Override public Void call() throws Exception {
barrier.await();
- ig1C.active(true);
+ ig1C.cluster().state(ClusterState.ACTIVE);
return null;
}
@@ -179,7 +180,7 @@ public class IgniteChangeGlobalStateTest extends IgniteChangeGlobalStateAbstract
@Override public Void call() throws Exception {
barrier.await();
- ig2C.active(true);
+ ig2C.cluster().state(ClusterState.ACTIVE);
return null;
}
@@ -189,7 +190,7 @@ public class IgniteChangeGlobalStateTest extends IgniteChangeGlobalStateAbstract
@Override public Void call() throws Exception {
barrier.await();
- ig3C.active(true);
+ ig3C.cluster().state(ClusterState.ACTIVE);
return null;
}
@@ -203,13 +204,13 @@ public class IgniteChangeGlobalStateTest extends IgniteChangeGlobalStateAbstract
f5.get();
f6.get();
- assertTrue(ig1B.active());
- assertTrue(ig2B.active());
- assertTrue(ig3B.active());
+ assertTrue(ig1B.cluster().state().active());
+ assertTrue(ig2B.cluster().state().active());
+ assertTrue(ig3B.cluster().state().active());
- assertTrue(ig1C.active());
- assertTrue(ig2C.active());
- assertTrue(ig3C.active());
+ assertTrue(ig1C.cluster().state().active());
+ assertTrue(ig2C.cluster().state().active());
+ assertTrue(ig3C.cluster().state().active());
}
/**
@@ -221,9 +222,9 @@ public class IgniteChangeGlobalStateTest extends IgniteChangeGlobalStateAbstract
final Ignite ig2B = backUp(1);
final Ignite ig3B = backUp(2);
- assertTrue(!ig1B.active());
- assertTrue(!ig2B.active());
- assertTrue(!ig3B.active());
+ assertTrue(!ig1B.cluster().state().active());
+ assertTrue(!ig2B.cluster().state().active());
+ assertTrue(!ig3B.cluster().state().active());
stopAllPrimary();
@@ -233,7 +234,7 @@ public class IgniteChangeGlobalStateTest extends IgniteChangeGlobalStateAbstract
@Override public Void call() throws Exception {
barrier.await();
- ig1B.active(true);
+ ig1B.cluster().state(ClusterState.ACTIVE);
return null;
}
@@ -243,7 +244,7 @@ public class IgniteChangeGlobalStateTest extends IgniteChangeGlobalStateAbstract
@Override public Void call() throws Exception {
barrier.await();
- ig2B.active(true);
+ ig2B.cluster().state(ClusterState.ACTIVE);
return null;
}
@@ -253,7 +254,7 @@ public class IgniteChangeGlobalStateTest extends IgniteChangeGlobalStateAbstract
@Override public Void call() throws Exception {
barrier.await();
- ig3B.active(true);
+ ig3B.cluster().state(ClusterState.ACTIVE);
return null;
}
@@ -263,9 +264,9 @@ public class IgniteChangeGlobalStateTest extends IgniteChangeGlobalStateAbstract
act2.get();
act3.get();
- assertTrue(ig1B.active());
- assertTrue(ig2B.active());
- assertTrue(ig3B.active());
+ assertTrue(ig1B.cluster().state().active());
+ assertTrue(ig2B.cluster().state().active());
+ assertTrue(ig3B.cluster().state().active());
}
/**
@@ -323,45 +324,45 @@ public class IgniteChangeGlobalStateTest extends IgniteChangeGlobalStateAbstract
Ignite ig2C = backUpClient(1);
Ignite ig3C = backUpClient(2);
- assertTrue(ig1P.active());
- assertTrue(ig2P.active());
- assertTrue(ig3P.active());
+ assertTrue(ig1P.cluster().state().active());
+ assertTrue(ig2P.cluster().state().active());
+ assertTrue(ig3P.cluster().state().active());
- assertTrue(!ig1B.active());
- assertTrue(!ig2B.active());
- assertTrue(!ig3B.active());
+ assertTrue(!ig1B.cluster().state().active());
+ assertTrue(!ig2B.cluster().state().active());
+ assertTrue(!ig3B.cluster().state().active());
- assertTrue(!ig1C.active());
- assertTrue(!ig2C.active());
- assertTrue(!ig3C.active());
+ assertTrue(!ig1C.cluster().state().active());
+ assertTrue(!ig2C.cluster().state().active());
+ assertTrue(!ig3C.cluster().state().active());
stopAllPrimary();
- ig2B.active(true);
+ ig2B.cluster().state(ClusterState.ACTIVE);
- assertTrue(ig1B.active());
- assertTrue(ig2B.active());
- assertTrue(ig3B.active());
+ assertTrue(ig1B.cluster().state().active());
+ assertTrue(ig2B.cluster().state().active());
+ assertTrue(ig3B.cluster().state().active());
- assertTrue(ig1C.active());
- assertTrue(ig2C.active());
- assertTrue(ig3C.active());
+ assertTrue(ig1C.cluster().state().active());
+ assertTrue(ig2C.cluster().state().active());
+ assertTrue(ig3C.cluster().state().active());
- ig1B.active(true);
- ig2B.active(true);
- ig3B.active(true);
+ ig1B.cluster().state(ClusterState.ACTIVE);
+ ig2B.cluster().state(ClusterState.ACTIVE);
+ ig3B.cluster().state(ClusterState.ACTIVE);
- ig1C.active(true);
- ig2C.active(true);
- ig3C.active(true);
+ ig1C.cluster().state(ClusterState.ACTIVE);
+ ig2C.cluster().state(ClusterState.ACTIVE);
+ ig3C.cluster().state(ClusterState.ACTIVE);
- assertTrue(ig1B.active());
- assertTrue(ig2B.active());
- assertTrue(ig3B.active());
+ assertTrue(ig1B.cluster().state().active());
+ assertTrue(ig2B.cluster().state().active());
+ assertTrue(ig3B.cluster().state().active());
- assertTrue(ig1C.active());
- assertTrue(ig2C.active());
- assertTrue(ig3C.active());
+ assertTrue(ig1C.cluster().state().active());
+ assertTrue(ig2C.cluster().state().active());
+ assertTrue(ig3C.cluster().state().active());
}
/**
@@ -377,13 +378,13 @@ public class IgniteChangeGlobalStateTest extends IgniteChangeGlobalStateAbstract
Ignite ig2C = backUpClient(1);
Ignite ig3C = backUpClient(2);
- assertTrue(!ig1B.active());
- assertTrue(!ig2B.active());
- assertTrue(!ig3B.active());
+ assertTrue(!ig1B.cluster().state().active());
+ assertTrue(!ig2B.cluster().state().active());
+ assertTrue(!ig3B.cluster().state().active());
- assertTrue(!ig1C.active());
- assertTrue(!ig2C.active());
- assertTrue(!ig3C.active());
+ assertTrue(!ig1C.cluster().state().active());
+ assertTrue(!ig2C.cluster().state().active());
+ assertTrue(!ig3C.cluster().state().active());
checkExceptionTryUseCache(ig1B);
checkExceptionTryUseCache(ig2B);
@@ -420,13 +421,13 @@ public class IgniteChangeGlobalStateTest extends IgniteChangeGlobalStateAbstract
Ignite ig2C = backUpClient(1);
Ignite ig3C = backUpClient(2);
- assertTrue(!ig1B.active());
- assertTrue(!ig2B.active());
- assertTrue(!ig3B.active());
+ assertTrue(!ig1B.cluster().state().active());
+ assertTrue(!ig2B.cluster().state().active());
+ assertTrue(!ig3B.cluster().state().active());
- assertTrue(!ig1C.active());
- assertTrue(!ig2C.active());
- assertTrue(!ig3C.active());
+ assertTrue(!ig1C.cluster().state().active());
+ assertTrue(!ig2C.cluster().state().active());
+ assertTrue(!ig3C.cluster().state().active());
checkExceptionTryUseService(ig1B);
checkExceptionTryUseService(ig2B);
@@ -463,13 +464,13 @@ public class IgniteChangeGlobalStateTest extends IgniteChangeGlobalStateAbstract
Ignite ig2C = backUpClient(1);
Ignite ig3C = backUpClient(2);
- assertTrue(!ig1B.active());
- assertTrue(!ig2B.active());
- assertTrue(!ig3B.active());
+ assertTrue(!ig1B.cluster().state().active());
+ assertTrue(!ig2B.cluster().state().active());
+ assertTrue(!ig3B.cluster().state().active());
- assertTrue(!ig1C.active());
- assertTrue(!ig2C.active());
- assertTrue(!ig3C.active());
+ assertTrue(!ig1C.cluster().state().active());
+ assertTrue(!ig2C.cluster().state().active());
+ assertTrue(!ig3C.cluster().state().active());
checkExceptionTryUseDataStructure(ig1B);
checkExceptionTryUseDataStructure(ig2B);
@@ -511,24 +512,24 @@ public class IgniteChangeGlobalStateTest extends IgniteChangeGlobalStateAbstract
final Ignite ig3C = backUpClient(2);
- assertTrue(ig1P.active());
- assertTrue(ig2P.active());
- assertTrue(ig3P.active());
+ assertTrue(ig1P.cluster().state().active());
+ assertTrue(ig2P.cluster().state().active());
+ assertTrue(ig3P.cluster().state().active());
- assertTrue(!ig1B.active());
- assertTrue(!ig2B.active());
- assertTrue(!ig3B.active());
+ assertTrue(!ig1B.cluster().state().active());
+ assertTrue(!ig2B.cluster().state().active());
+ assertTrue(!ig3B.cluster().state().active());
- assertTrue(!ig1C.active());
- assertTrue(!ig2C.active());
- assertTrue(!ig3C.active());
+ assertTrue(!ig1C.cluster().state().active());
+ assertTrue(!ig2C.cluster().state().active());
+ assertTrue(!ig3C.cluster().state().active());
stopPrimary(0);
boolean exc = false;
try {
- ig3C.active(true);
+ ig3C.cluster().state(ClusterState.ACTIVE);
}
catch (IgniteException e) {
exc = true;
@@ -542,13 +543,13 @@ public class IgniteChangeGlobalStateTest extends IgniteChangeGlobalStateAbstract
if (!exc)
fail();
- assertTrue(!ig1B.active());
- assertTrue(!ig2B.active());
- assertTrue(!ig3B.active());
+ assertTrue(!ig1B.cluster().state().active());
+ assertTrue(!ig2B.cluster().state().active());
+ assertTrue(!ig3B.cluster().state().active());
- assertTrue(!ig1C.active());
- assertTrue(!ig2C.active());
- assertTrue(!ig3C.active());
+ assertTrue(!ig1C.cluster().state().active());
+ assertTrue(!ig2C.cluster().state().active());
+ assertTrue(!ig3C.cluster().state().active());
}
/**
@@ -573,22 +574,22 @@ public class IgniteChangeGlobalStateTest extends IgniteChangeGlobalStateAbstract
Ignite ig2CB = backUpClient(1);
Ignite ig3CB = backUpClient(2);
- assertTrue(ig1P.active());
- assertTrue(ig2P.active());
- assertTrue(ig3P.active());
+ assertTrue(ig1P.cluster().state().active());
+ assertTrue(ig2P.cluster().state().active());
+ assertTrue(ig3P.cluster().state().active());
- assertTrue(!ig1B.active());
- assertTrue(!ig2B.active());
- assertTrue(!ig3B.active());
+ assertTrue(!ig1B.cluster().state().active());
+ assertTrue(!ig2B.cluster().state().active());
+ assertTrue(!ig3B.cluster().state().active());
- assertTrue(!ig1CB.active());
- assertTrue(!ig2CB.active());
- assertTrue(!ig3CB.active());
+ assertTrue(!ig1CB.cluster().state().active());
+ assertTrue(!ig2CB.cluster().state().active());
+ assertTrue(!ig3CB.cluster().state().active());
stopPrimary(0);
try {
- ig3CB.active(true);
+ ig3CB.cluster().state(ClusterState.ACTIVE);
fail("Activation should fail");
}
@@ -599,32 +600,32 @@ public class IgniteChangeGlobalStateTest extends IgniteChangeGlobalStateAbstract
assertTrue(t.getMessage().contains("can't get lock during"));
}
- assertTrue(!ig1B.active());
- assertTrue(!ig2B.active());
- assertTrue(!ig3B.active());
+ assertTrue(!ig1B.cluster().state().active());
+ assertTrue(!ig2B.cluster().state().active());
+ assertTrue(!ig3B.cluster().state().active());
- assertTrue(!ig1CB.active());
- assertTrue(!ig2CB.active());
- assertTrue(!ig3CB.active());
+ assertTrue(!ig1CB.cluster().state().active());
+ assertTrue(!ig2CB.cluster().state().active());
+ assertTrue(!ig3CB.cluster().state().active());
- assertTrue(ig2P.active());
- assertTrue(ig3P.active());
+ assertTrue(ig2P.cluster().state().active());
+ assertTrue(ig3P.cluster().state().active());
- assertTrue(ig1CP.active());
- assertTrue(ig2CP.active());
- assertTrue(ig3CP.active());
+ assertTrue(ig1CP.cluster().state().active());
+ assertTrue(ig2CP.cluster().state().active());
+ assertTrue(ig3CP.cluster().state().active());
stopAllPrimary();
- ig2CB.active(true);
+ ig2CB.cluster().state(ClusterState.ACTIVE);
- assertTrue(ig1B.active());
- assertTrue(ig2B.active());
- assertTrue(ig3B.active());
+ assertTrue(ig1B.cluster().state().active());
+ assertTrue(ig2B.cluster().state().active());
+ assertTrue(ig3B.cluster().state().active());
- assertTrue(ig1CB.active());
- assertTrue(ig2CB.active());
- assertTrue(ig3CB.active());
+ assertTrue(ig1CB.cluster().state().active());
+ assertTrue(ig2CB.cluster().state().active());
+ assertTrue(ig3CB.cluster().state().active());
}
/**
@@ -636,15 +637,15 @@ public class IgniteChangeGlobalStateTest extends IgniteChangeGlobalStateAbstract
Ignite ig2 = primary(1);
Ignite ig3 = primary(2);
- assertTrue(ig1.active());
- assertTrue(ig2.active());
- assertTrue(ig3.active());
+ assertTrue(ig1.cluster().state().active());
+ assertTrue(ig2.cluster().state().active());
+ assertTrue(ig3.cluster().state().active());
- ig1.active(false);
+ ig1.cluster().state(ClusterState.INACTIVE);
- assertTrue(!ig1.active());
- assertTrue(!ig2.active());
... 4266 lines suppressed ...