IGNITE-13516 Fix binary_metadata directory for in-memory cluster - Fixes #8308.
Signed-off-by: Aleksey Plekhanov <plehanov.alex@gmail.com>
(cherry picked from commit a24f070320a22848389258faec431914875fbe45)
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryProcessorImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryProcessorImpl.java
index ac12880..36fd835 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryProcessorImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryProcessorImpl.java
@@ -239,7 +239,7 @@
metadataFileStore = new BinaryMetadataFileStore(metadataLocCache,
ctx,
log,
- binaryMetadataFileStoreDir == null ?
+ CU.isPersistenceEnabled(ctx.config()) && binaryMetadataFileStoreDir == null ?
resolveBinaryWorkDir(ctx.config().getWorkDirectory(),
ctx.pdsFolderResolver().resolveFolders().folderName()) :
binaryMetadataFileStoreDir);
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/BinaryMetadataInMemoryTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/BinaryMetadataInMemoryTest.java
new file mode 100644
index 0000000..635c6b4
--- /dev/null
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/BinaryMetadataInMemoryTest.java
@@ -0,0 +1,47 @@
+/*
+ * 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.cache.binary;
+
+import java.io.File;
+import org.apache.ignite.configuration.DataStorageConfiguration;
+import org.apache.ignite.internal.IgniteEx;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.junit.Test;
+
+/**
+ * Test binary metadata for in-memory cluster.
+ */
+public class BinaryMetadataInMemoryTest extends GridCommonAbstractTest {
+ /**
+ * Test that binary_meta directory is empty for in-memory cluster.
+ */
+ @Test
+ public void testBinaryMetadataDir() throws Exception {
+ IgniteEx grid = startGrid();
+
+ grid.binary().builder("TestType").setField("TestField", 1).build();
+
+ stopGrid();
+
+ File metaDir = U.resolveWorkDirectory(U.defaultWorkDirectory(),
+ DataStorageConfiguration.DFLT_BINARY_METADATA_PATH, false);
+
+ assertTrue(F.isEmpty(metaDir.list()));
+ }
+}
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryObjectsTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryObjectsTestSuite.java
index 63f557b..e049c09 100644
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryObjectsTestSuite.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryObjectsTestSuite.java
@@ -56,6 +56,7 @@
import org.apache.ignite.internal.binary.streams.BinaryHeapStreamByteOrderSelfTest;
import org.apache.ignite.internal.binary.streams.BinaryOffheapStreamByteOrderSelfTest;
import org.apache.ignite.internal.processors.cache.binary.BinaryAtomicCacheLocalEntriesSelfTest;
+import org.apache.ignite.internal.processors.cache.binary.BinaryMetadataInMemoryTest;
import org.apache.ignite.internal.processors.cache.binary.BinaryMetadataMoveLegacyFolderTest;
import org.apache.ignite.internal.processors.cache.binary.BinaryMetadataRegistrationCacheApiTest;
import org.apache.ignite.internal.processors.cache.binary.BinaryMetadataRegistrationCacheStoreTest;
@@ -155,6 +156,7 @@
BinaryMetadataRegistrationCacheApiTest.class,
BinaryMetadataRegistrationEntryProcessorTest.class,
BinaryMetadataRegistrationCacheStoreTest.class,
+ BinaryMetadataInMemoryTest.class,
GridCacheClientNodeBinaryObjectMetadataMultinodeTest.class,
IgniteBinaryMetadataUpdateChangingTopologySelfTest.class,
