IGNITE-10348 Safely recreate metastore to mitigate IGNITE-8735

Signed-off-by: Ivan Rakov <irakov@apache.org>
apache · Dec 7, 2018 · 86f92d9 · 86f92d9
1 parent 137a0e7
commit 86f92d9
Show file tree

Hide file tree

Showing 8 changed files with 702 additions and 25 deletions.
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/PageIdAllocator.java b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/PageIdAllocator.java
@@ -35,8 +35,11 @@ public interface PageIdAllocator {
     /** Special partition reserved for index space. */
     public static final int INDEX_PARTITION = 0xFFFF;
 
+    /** Old special partition reserved for metastore space. */
+    public static final int OLD_METASTORE_PARTITION = 0x0;
+
     /** Special partition reserved for metastore space. */
-    public static final int METASTORE_PARTITION = 0x0;
+    public static final int METASTORE_PARTITION = 0x1;
 
     /**
      * Allocates a page from the space for the given partition ID and the given flags.

diff --git a/...es/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java b/...es/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
@@ -105,6 +105,7 @@
 import org.apache.ignite.internal.processors.cache.persistence.IgniteCacheDatabaseSharedManager;
 import org.apache.ignite.internal.processors.cache.persistence.file.FilePageStoreManager;
 import org.apache.ignite.internal.processors.cache.persistence.freelist.FreeList;
+import org.apache.ignite.internal.processors.cache.persistence.metastorage.MetaStorage;
 import org.apache.ignite.internal.processors.cache.persistence.metastorage.MetastorageLifecycleListener;
 import org.apache.ignite.internal.processors.cache.persistence.metastorage.ReadOnlyMetastorage;
 import org.apache.ignite.internal.processors.cache.persistence.partstate.GroupPartitionId;
@@ -277,6 +278,9 @@ public class GridCacheProcessor extends GridProcessorAdapter {
     /** Cache recovery lifecycle state and actions. */
     private final CacheRecoveryLifecycle recovery = new CacheRecoveryLifecycle();
 
+    /** Tmp storage for meta migration. */
+    private MetaStorage.TmpStorage tmpStorage;
+
     /**
      * @param ctx Kernal context.
      */
@@ -5470,6 +5474,20 @@ public <T> T clone(final T obj) throws IgniteCheckedException {
         });
     }
 
+    /**
+     * Get Temporary storage
+     */
+    public MetaStorage.TmpStorage getTmpStorage() {
+        return tmpStorage;
+    }
+
+    /**
+     * Set Temporary storage
+     */
+    public void setTmpStorage(MetaStorage.TmpStorage tmpStorage) {
+        this.tmpStorage = tmpStorage;
+    }
+
     /**
      * Recovery lifecycle for caches.
      */

diff --git a/...va/org/apache/ignite/internal/processors/cache/persistence/file/FilePageStoreManager.java b/...va/org/apache/ignite/internal/processors/cache/persistence/file/FilePageStoreManager.java
@@ -374,10 +374,10 @@ public FilePageStoreManager(GridKernalContext ctx) {
 
             CacheStoreHolder holder = initDir(
                 new File(storeWorkDir, META_STORAGE_NAME),
-                    grpId,
-                    1,
-                    dataRegion.memoryMetrics(),
-                    false);
+                grpId,
+                PageIdAllocator.METASTORE_PARTITION + 1,
+                dataRegion.memoryMetrics(),
+                false);
 
             CacheStoreHolder old = idxCacheStores.put(grpId, holder);