You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ag...@apache.org on 2019/02/26 17:58:19 UTC
[ignite] branch master updated: IGNITE-11390 Fixed distributed
metastorage start for an in-memory cluster - Fixes #6170.
This is an automated email from the ASF dual-hosted git repository.
agoncharuk 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 7c21098 IGNITE-11390 Fixed distributed metastorage start for an in-memory cluster - Fixes #6170.
7c21098 is described below
commit 7c21098c67d3732ad4c5aba3701fa00ba339a699
Author: ibessonov <be...@gmail.com>
AuthorDate: Tue Feb 26 20:56:51 2019 +0300
IGNITE-11390 Fixed distributed metastorage start for an in-memory cluster - Fixes #6170.
Signed-off-by: Alexey Goncharuk <al...@gmail.com>
---
.../baseline/autoadjust/ChangeTopologyWatcher.java | 2 +
.../persistence/DistributedMetaStorageImpl.java | 11 ++++--
...a => DistributedConfigurationAbstractTest.java} | 44 +++++++---------------
.../DistributedConfigurationInMemoryTest.java | 26 +++++++++++++
.../DistributedConfigurationPersistentTest.java | 26 +++++++++++++
.../ignite/testsuites/IgniteBasicTestSuite.java | 2 +
.../ignite/testsuites/IgnitePdsTestSuite.java | 2 +
7 files changed, 80 insertions(+), 33 deletions(-)
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/baseline/autoadjust/ChangeTopologyWatcher.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/baseline/autoadjust/ChangeTopologyWatcher.java
index 1188fb4..ad63d13 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/baseline/autoadjust/ChangeTopologyWatcher.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/baseline/autoadjust/ChangeTopologyWatcher.java
@@ -97,6 +97,8 @@ public class ChangeTopologyWatcher implements GridLocalEventListener {
if (isLocalNodeCoordinator(discoveryMgr)) {
exchangeManager.affinityReadyFuture(new AffinityTopologyVersion(discoEvt.topologyVersion()))
.listen((IgniteInClosure<IgniteInternalFuture<AffinityTopologyVersion>>)future -> {
+ if (future.error() != null)
+ return;
if (exchangeManager.lastFinishedFuture().hasLostPartitions()) {
log.warning("Baseline won't be changed cause the lost partitions were detected");
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/metastorage/persistence/DistributedMetaStorageImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/metastorage/persistence/DistributedMetaStorageImpl.java
index a2acb7b..2f67848 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/metastorage/persistence/DistributedMetaStorageImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/metastorage/persistence/DistributedMetaStorageImpl.java
@@ -185,9 +185,6 @@ public class DistributedMetaStorageImpl extends GridProcessorAdapter
ver = DistributedMetaStorageVersion.INITIAL_VERSION;
bridge = new EmptyDistributedMetaStorageBridge();
-
- for (DistributedMetastorageLifecycleListener subscriber : subscrProcessor.getDistributedMetastorageSubscribers())
- subscriber.onReadyForRead(this);
}
GridDiscoveryManager discovery = ctx.discovery();
@@ -205,6 +202,14 @@ public class DistributedMetaStorageImpl extends GridProcessorAdapter
/** {@inheritDoc} */
@Override public void onKernalStart(boolean active) throws IgniteCheckedException {
+ if (ctx.clientNode() || ctx.isDaemon())
+ return;
+
+ if (!isPersistenceEnabled(ctx.config())) {
+ for (DistributedMetastorageLifecycleListener subscriber : subscrProcessor.getDistributedMetastorageSubscribers())
+ subscriber.onReadyForRead(this);
+ }
+
if (active)
onActivate(ctx);
}
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/configuration/distributed/DistributedConfigurationTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/configuration/distributed/DistributedConfigurationAbstractTest.java
similarity index 84%
rename from modules/core/src/test/java/org/apache/ignite/internal/processors/configuration/distributed/DistributedConfigurationTest.java
rename to modules/core/src/test/java/org/apache/ignite/internal/processors/configuration/distributed/DistributedConfigurationAbstractTest.java
index c613a85..6b87a67 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/configuration/distributed/DistributedConfigurationTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/configuration/distributed/DistributedConfigurationAbstractTest.java
@@ -23,10 +23,12 @@ import org.apache.ignite.internal.IgniteEx;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
import org.junit.Test;
+import static org.junit.Assume.assumeTrue;
+
/**
*
*/
-public class DistributedConfigurationTest extends GridCommonAbstractTest {
+public abstract class DistributedConfigurationAbstractTest extends GridCommonAbstractTest {
/** */
private static final String TEST_PROP = "someLong";
@@ -57,7 +59,7 @@ public class DistributedConfigurationTest extends GridCommonAbstractTest {
DataStorageConfiguration storageCfg = new DataStorageConfiguration();
storageCfg.getDefaultDataRegionConfiguration()
- .setPersistenceEnabled(true)
+ .setPersistenceEnabled(isPersistent())
.setMaxSize(500L * 1024 * 1024);
cfg.setDataStorageConfiguration(storageCfg);
@@ -65,40 +67,16 @@ public class DistributedConfigurationTest extends GridCommonAbstractTest {
return cfg;
}
-// /**
-// * @throws Exception If failed.
-// */
-// @Test
-// public void test() throws Exception {
-// IgniteEx ignite0 = startGrid(0);
-// IgniteEx ignite1 = startGrid(1);
-//
-// ignite0.cluster().active(true);
-//
-// Assert.assertEquals(0, ignite0.cluster().baselineConfiguration().getBaselineAutoAdjustTimeout());
-// Assert.assertEquals(0, ignite1.cluster().baselineConfiguration().getBaselineAutoAdjustTimeout());
-//
-// ignite0.cluster().baselineConfiguration().setBaselineAutoAdjustTimeout(2);
-//
-// Assert.assertEquals(2, ignite0.cluster().baselineConfiguration().getBaselineAutoAdjustTimeout());
-// Assert.assertEquals(2, ignite1.cluster().baselineConfiguration().getBaselineAutoAdjustTimeout());
-//
-// stopAllGrids();
-//
-// ignite0 = startGrid(0);
-// ignite1 = startGrid(1);
-//
-// ignite0.cluster().active(true);
-//
-// Assert.assertEquals(2, ignite0.cluster().baselineConfiguration().getBaselineAutoAdjustTimeout());
-// Assert.assertEquals(2, ignite1.cluster().baselineConfiguration().getBaselineAutoAdjustTimeout());
-// }
+ /** */
+ protected abstract boolean isPersistent();
/**
* @throws Exception If failed.
*/
@Test
public void testSuccessClusterWideUpdate() throws Exception {
+ assumeTrue(isPersistent());
+
IgniteEx ignite0 = startGrid(0);
IgniteEx ignite1 = startGrid(1);
@@ -135,6 +113,8 @@ public class DistributedConfigurationTest extends GridCommonAbstractTest {
*/
@Test
public void testReadLocalValueOnInactiveGrid() throws Exception {
+ assumeTrue(isPersistent());
+
IgniteEx ignite0 = startGrid(0);
startGrid(1);
@@ -193,6 +173,8 @@ public class DistributedConfigurationTest extends GridCommonAbstractTest {
*/
@Test(expected = NotWritablePropertyException.class)
public void testPropagateValueOnInactiveGridShouldThrowException() throws Exception {
+ assumeTrue(isPersistent());
+
IgniteEx ignite0 = (IgniteEx)startGrids(2);
DistributedLongProperty long0 = ignite0.context().distributedConfiguration().registerLong(TEST_PROP, 0L);
@@ -205,6 +187,8 @@ public class DistributedConfigurationTest extends GridCommonAbstractTest {
*/
@Test
public void testReadInitValueBeforeOnReadyForReady() throws Exception {
+ assumeTrue(isPersistent());
+
IgniteEx ignite0 = startGrid(0);
IgniteEx ignite1 = startGrid(1);
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/configuration/distributed/DistributedConfigurationInMemoryTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/configuration/distributed/DistributedConfigurationInMemoryTest.java
new file mode 100644
index 0000000..f79249f
--- /dev/null
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/configuration/distributed/DistributedConfigurationInMemoryTest.java
@@ -0,0 +1,26 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.processors.configuration.distributed;
+
+/** */
+public class DistributedConfigurationInMemoryTest extends DistributedConfigurationAbstractTest {
+ /** {@inheritDoc} */
+ @Override protected boolean isPersistent() {
+ return false;
+ }
+}
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/configuration/distributed/DistributedConfigurationPersistentTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/configuration/distributed/DistributedConfigurationPersistentTest.java
new file mode 100644
index 0000000..4db7c54
--- /dev/null
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/configuration/distributed/DistributedConfigurationPersistentTest.java
@@ -0,0 +1,26 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.processors.configuration.distributed;
+
+/** */
+public class DistributedConfigurationPersistentTest extends DistributedConfigurationAbstractTest {
+ /** {@inheritDoc} */
+ @Override protected boolean isPersistent() {
+ return true;
+ }
+}
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBasicTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBasicTestSuite.java
index cc1a019..9168e76 100644
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBasicTestSuite.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBasicTestSuite.java
@@ -65,6 +65,7 @@ import org.apache.ignite.internal.processors.cache.transactions.TransactionInteg
import org.apache.ignite.internal.processors.closure.GridClosureProcessorRemoteTest;
import org.apache.ignite.internal.processors.closure.GridClosureProcessorSelfTest;
import org.apache.ignite.internal.processors.closure.GridClosureSerializationTest;
+import org.apache.ignite.internal.processors.configuration.distributed.DistributedConfigurationInMemoryTest;
import org.apache.ignite.internal.processors.continuous.GridEventConsumeSelfTest;
import org.apache.ignite.internal.processors.continuous.GridMessageListenSelfTest;
import org.apache.ignite.internal.processors.database.BPlusTreeFakeReuseSelfTest;
@@ -214,6 +215,7 @@ import org.junit.runners.Suite;
// In-memory Distributed MetaStorage.
DistributedMetaStorageTest.class,
+ DistributedConfigurationInMemoryTest.class,
ConsistentIdImplicitlyExplicitlyTest.class,
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgnitePdsTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgnitePdsTestSuite.java
index 046b7ff..a58b2dd 100644
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgnitePdsTestSuite.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgnitePdsTestSuite.java
@@ -50,6 +50,7 @@ import org.apache.ignite.internal.processors.cache.persistence.wal.ExplicitWalDe
import org.apache.ignite.internal.processors.cache.persistence.wal.SegmentedRingByteBufferTest;
import org.apache.ignite.internal.processors.cache.persistence.wal.SysPropWalDeltaConsistencyTest;
import org.apache.ignite.internal.processors.cache.persistence.wal.aware.SegmentAwareTest;
+import org.apache.ignite.internal.processors.configuration.distributed.DistributedConfigurationPersistentTest;
import org.apache.ignite.internal.processors.database.IgniteDbDynamicCacheSelfTest;
import org.apache.ignite.internal.processors.database.IgniteDbMultiNodePutGetTest;
import org.apache.ignite.internal.processors.database.IgniteDbPutGetWithCacheStoreTest;
@@ -173,5 +174,6 @@ public class IgnitePdsTestSuite {
//MetaStorage
GridTestUtils.addTestIfNeeded(suite, IgniteMetaStorageBasicTest.class, ignoredTests);
GridTestUtils.addTestIfNeeded(suite, DistributedMetaStoragePersistentTest.class, ignoredTests);
+ GridTestUtils.addTestIfNeeded(suite, DistributedConfigurationPersistentTest.class, ignoredTests);
}
}