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 2018/09/03 16:52:11 UTC
ignite git commit: IGNITE-9425 Fixed NPE on index rebuild - Fixes
#4647.
Repository: ignite
Updated Branches:
refs/heads/master 8cb4591d6 -> c7aaee7ed
IGNITE-9425 Fixed NPE on index rebuild - Fixes #4647.
Signed-off-by: Alexey Goncharuk <al...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c7aaee7e
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c7aaee7e
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c7aaee7e
Branch: refs/heads/master
Commit: c7aaee7ed577dbfc550948494ca74d8261bbdff4
Parents: 8cb4591
Author: dkarachentsev <dk...@gridgain.com>
Authored: Mon Sep 3 19:45:44 2018 +0300
Committer: Alexey Goncharuk <al...@gmail.com>
Committed: Mon Sep 3 19:45:44 2018 +0300
----------------------------------------------------------------------
.../GridCacheDatabaseSharedManager.java | 3 +-
.../IgniteTwoRegionsRebuildIndexTest.java | 124 +++++++++++++++++++
.../IgnitePdsWithIndexingTestSuite.java | 2 +
3 files changed, 128 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/c7aaee7e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheDatabaseSharedManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheDatabaseSharedManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheDatabaseSharedManager.java
index 2e5f26f..a86b9f5 100755
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheDatabaseSharedManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheDatabaseSharedManager.java
@@ -1362,7 +1362,8 @@ public class GridCacheDatabaseSharedManager extends IgniteCacheDatabaseSharedMan
final int cacheId = cacheCtx.cacheId();
final GridFutureAdapter<Void> usrFut = idxRebuildFuts.get(cacheId);
- if (!cctx.pageStore().hasIndexStore(cacheCtx.groupId()) && cacheCtx.affinityNode()) {
+ if (!cctx.pageStore().hasIndexStore(cacheCtx.groupId()) && cacheCtx.affinityNode()
+ && cacheCtx.group().persistenceEnabled()) {
IgniteInternalFuture<?> rebuildFut = cctx.kernalContext().query()
.rebuildIndexesFromHash(Collections.singleton(cacheCtx.cacheId()));
http://git-wip-us.apache.org/repos/asf/ignite/blob/c7aaee7e/modules/indexing/src/test/java/org/apache/ignite/internal/processors/database/IgniteTwoRegionsRebuildIndexTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/database/IgniteTwoRegionsRebuildIndexTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/database/IgniteTwoRegionsRebuildIndexTest.java
new file mode 100644
index 0000000..7d5b296
--- /dev/null
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/database/IgniteTwoRegionsRebuildIndexTest.java
@@ -0,0 +1,124 @@
+/*
+ * 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.database;
+
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteDataStreamer;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.DataRegionConfiguration;
+import org.apache.ignite.configuration.DataStorageConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+
+/**
+ * Tests the case when preformed index rebuild for created by client in-memory cache.
+ */
+public class IgniteTwoRegionsRebuildIndexTest extends GridCommonAbstractTest {
+ /** */
+ private static final String PERSISTED_CACHE = "persisted";
+
+ /** */
+ private static final String INMEMORY_CACHE = "inmemory";
+
+ /** {@inheritDoc} */
+ @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
+ IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
+
+ boolean client = igniteInstanceName.startsWith("client");
+
+ DataStorageConfiguration dsCfg = new DataStorageConfiguration();
+
+ if (!client) {
+ DataRegionConfiguration drCfg1 = new DataRegionConfiguration();
+ drCfg1.setMaxSize(16 * 1024 * 1024);
+ drCfg1.setName("nopersistence");
+ drCfg1.setInitialSize(drCfg1.getMaxSize());
+ drCfg1.setPersistenceEnabled(false);
+
+ DataRegionConfiguration drCfg2 = new DataRegionConfiguration();
+ drCfg2.setMaxSize(16 * 1024 * 1024);
+ drCfg2.setName("persistence");
+ drCfg2.setInitialSize(drCfg2.getMaxSize());
+ drCfg2.setPersistenceEnabled(true);
+
+ dsCfg.setDataRegionConfigurations(drCfg1, drCfg2);
+
+ cfg.setDataStorageConfiguration(dsCfg);
+ }
+ else {
+ CacheConfiguration ccfg1 = new CacheConfiguration(PERSISTED_CACHE);
+ CacheConfiguration ccfg2 = new CacheConfiguration(INMEMORY_CACHE);
+
+ ccfg1.setDataRegionName("persistence");
+ ccfg2.setDataRegionName("nopersistence");
+
+ cfg.setCacheConfiguration(ccfg1, ccfg2);
+ cfg.setClientMode(true);
+ }
+
+ return cfg;
+ }
+
+ /** {@inheritDoc} */
+ @Override protected void beforeTest() throws Exception {
+ super.beforeTest();
+
+ cleanPersistenceDir();
+ }
+
+ /** {@inheritDoc} */
+ @Override protected void afterTest() throws Exception {
+ super.afterTest();
+
+ stopAllGrids();
+
+ cleanPersistenceDir();
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
+ public void testRebuildIndexes() throws Exception {
+ startGrid("server");
+ Ignite client = startGrid("client");
+
+ client.cluster().active(true);
+
+ populateData(client, PERSISTED_CACHE);
+ populateData(client, INMEMORY_CACHE);
+
+ stopGrid("server");
+ startGrid("server");
+
+ stopGrid("client");
+ startGrid("client");
+ }
+
+ /**
+ * @param ignite Ignite.
+ * @param cacheName Cache name.
+ */
+ private void populateData(Ignite ignite, String cacheName) {
+ try (IgniteDataStreamer<Object, Object> streamer = ignite.dataStreamer(cacheName)) {
+ for (int i = 0; i < 1000; i++)
+ streamer.addData(i, i);
+
+ streamer.flush();
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/c7aaee7e/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgnitePdsWithIndexingTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgnitePdsWithIndexingTestSuite.java b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgnitePdsWithIndexingTestSuite.java
index 033e5a9..67b9fad 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgnitePdsWithIndexingTestSuite.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgnitePdsWithIndexingTestSuite.java
@@ -25,6 +25,7 @@ import org.apache.ignite.internal.processors.database.IgniteDbSingleNodeWithInde
import org.apache.ignite.internal.processors.database.IgniteDbSingleNodeWithIndexingWalRestoreTest;
import org.apache.ignite.internal.processors.database.IgnitePersistentStoreQueryWithMultipleClassesPerCacheTest;
import org.apache.ignite.internal.processors.database.IgnitePersistentStoreSchemaLoadTest;
+import org.apache.ignite.internal.processors.database.IgniteTwoRegionsRebuildIndexTest;
/**
*
@@ -44,6 +45,7 @@ public class IgnitePdsWithIndexingTestSuite extends TestSuite {
suite.addTestSuite(IgnitePdsSingleNodeWithIndexingAndGroupPutGetPersistenceSelfTest.class);
suite.addTestSuite(IgnitePersistentStoreSchemaLoadTest.class);
suite.addTestSuite(IgnitePersistentStoreQueryWithMultipleClassesPerCacheTest.class);
+ suite.addTestSuite(IgniteTwoRegionsRebuildIndexTest.class);
return suite;
}