This is an automated email from the ASF dual-hosted git repository.
nizhikov 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 1afc0adde11 IGNITE-24617 Move db to the private constants (#11893)
1afc0adde11 is described below
commit 1afc0adde1114e1837f57eab1d58f2de5d9c8f0b
Author: Nikolay <[email protected]>
AuthorDate: Mon Mar 3 13:04:07 2025 +0300
IGNITE-24617 Move db to the private constants (#11893)
---
...ttyRestProcessorAuthenticationAbstractTest.java | 3 +-
.../rest/JettyRestProcessorBaselineSelfTest.java | 3 +-
.../JdbcThinAuthenticateConnectionSelfTest.java | 3 +-
.../persistence/FoldersReuseCompatibilityTest.java | 13 +++------
...IgnitePersistenceCompatibilityAbstractTest.java | 32 ++++++++++++++--------
.../snapshot/SnapshotCompressionBasicTest.java | 3 +-
.../persistence/file/FilePageStoreManager.java | 3 --
.../cache/persistence/filename/NodeFileTree.java | 5 ++--
.../persistence/filename/PdsFolderResolver.java | 6 ++--
.../cache/persistence/filename/SharedFileTree.java | 19 +++++++++----
.../encryption/EncryptedCacheCreateTest.java | 3 +-
.../Authentication1kUsersNodeRestartTest.java | 3 +-
.../AuthenticationConfigurationClusterTest.java | 3 +-
.../AuthenticationOnNotActiveClusterTest.java | 2 +-
.../AuthenticationProcessorNPEOnStartTest.java | 3 +-
.../AuthenticationProcessorNodeRestartTest.java | 2 +-
.../AuthenticationProcessorSelfTest.java | 2 +-
.../GridCacheRebalancingPartitionCountersTest.java | 4 +--
.../IgnitePdsRemoveDuringRebalancingTest.java | 8 ++----
...NoChangeDuringRebalanceOnNonNodeAssignTest.java | 20 ++++----------
.../ClientAffinityAssignmentWithBaselineTest.java | 6 ++--
.../db/checkpoint/IgniteMassLoadSandboxTest.java | 8 ++----
.../IgniteUidAsConsistentIdMigrationTest.java | 21 ++++++--------
.../db/wal/reader/IgniteWalReaderTest.java | 15 ++++------
.../testframework/junits/GridAbstractTest.java | 12 ++++++++
.../junits/common/GridCommonAbstractTest.java | 3 +-
.../org/apache/ignite/client/SecurityTest.java | 7 ++++-
.../authentication/SqlUserCommandSelfTest.java | 3 +-
.../cache/index/H2RowCachePageEvictionTest.java | 2 +-
29 files changed, 102 insertions(+), 115 deletions(-)
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 37ae4a6bef1..34f332facd7 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
@@ -24,7 +24,6 @@ import
org.apache.ignite.configuration.DataRegionConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
import
org.apache.ignite.internal.processors.authentication.IgniteAccessControlException;
-import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.testframework.GridTestUtils;
import org.junit.Test;
@@ -43,7 +42,7 @@ public abstract class
JettyRestProcessorAuthenticationAbstractTest extends Jetty
/** {@inheritDoc} */
@Override protected void beforeTestsStarted() throws Exception {
- U.resolveWorkDirectory(U.defaultWorkDirectory(), "db", true);
+ recreateDefaultDb();
super.beforeTestsStarted();
}
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 f938d663929..f10bfad2641 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
@@ -30,7 +30,6 @@ import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.internal.IgniteEx;
import
org.apache.ignite.internal.processors.rest.handlers.cluster.GridBaselineCommandResponse;
import org.apache.ignite.internal.util.typedef.F;
-import org.apache.ignite.internal.util.typedef.internal.U;
import org.jetbrains.annotations.Nullable;
import org.junit.Test;
@@ -43,7 +42,7 @@ import static
org.apache.ignite.internal.processors.rest.GridRestResponse.STATUS
public class JettyRestProcessorBaselineSelfTest extends
JettyRestProcessorCommonSelfTest {
/** {@inheritDoc} */
@Override protected void beforeTestsStarted() throws Exception {
- U.resolveWorkDirectory(U.defaultWorkDirectory(), "db", true);
+ recreateDefaultDb();
super.beforeTestsStarted();
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 15cbabfc655..d46e1466ad2 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
@@ -25,7 +25,6 @@ import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.DataRegionConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
-import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.testframework.GridTestUtils;
import org.junit.Test;
@@ -61,7 +60,7 @@ public class JdbcThinAuthenticateConnectionSelfTest extends
JdbcThinAbstractSelf
@Override protected void beforeTest() throws Exception {
super.beforeTest();
- U.resolveWorkDirectory(U.defaultWorkDirectory(), "db", true);
+ recreateDefaultDb();
startGrids(2);
diff --git
a/modules/compatibility/src/test/java/org/apache/ignite/compatibility/persistence/FoldersReuseCompatibilityTest.java
b/modules/compatibility/src/test/java/org/apache/ignite/compatibility/persistence/FoldersReuseCompatibilityTest.java
index 332c70e87dc..0d1ea6a7584 100644
---
a/modules/compatibility/src/test/java/org/apache/ignite/compatibility/persistence/FoldersReuseCompatibilityTest.java
+++
b/modules/compatibility/src/test/java/org/apache/ignite/compatibility/persistence/FoldersReuseCompatibilityTest.java
@@ -24,7 +24,6 @@ import java.util.TreeSet;
import java.util.function.Consumer;
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCache;
-import org.apache.ignite.IgniteCheckedException;
import
org.apache.ignite.compatibility.testframework.junits.SkipTestIfIsJdkNewer;
import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.configuration.MemoryConfiguration;
@@ -32,7 +31,6 @@ import
org.apache.ignite.configuration.MemoryPolicyConfiguration;
import org.apache.ignite.configuration.PersistentStoreConfiguration;
import org.apache.ignite.internal.IgniteEx;
import
org.apache.ignite.internal.processors.cache.GridCacheAbstractFullApiSelfTest;
-import
org.apache.ignite.internal.processors.cache.persistence.file.FilePageStoreManager;
import
org.apache.ignite.internal.processors.cache.persistence.filename.NodeFileTree;
import
org.apache.ignite.internal.processors.cache.persistence.filename.PdsFolderResolver;
import org.apache.ignite.internal.util.typedef.internal.U;
@@ -190,18 +188,16 @@ public class FoldersReuseCompatibilityTest extends
IgnitePersistenceCompatibilit
/**
* @param indexes expected new style node indexes in folders
- * @throws IgniteCheckedException if failed
*/
- private void assertNodeIndexesInFolder(Integer... indexes) throws
IgniteCheckedException {
+ private void assertNodeIndexesInFolder(Integer... indexes) {
assertEquals(new TreeSet<>(Arrays.asList(indexes)),
getAllNodeIndexesInFolder());
}
/**
* @return set of all indexes of nodes found in work folder
- * @throws IgniteCheckedException if failed.
*/
- @NotNull private Set<Integer> getAllNodeIndexesInFolder() throws
IgniteCheckedException {
- final File curFolder = new File(U.defaultWorkDirectory(),
FilePageStoreManager.DFLT_STORE_DIR);
+ @NotNull private Set<Integer> getAllNodeIndexesInFolder() {
+ final File curFolder = sharedFileTree().db();
final Set<Integer> indexes = new TreeSet<>();
final File[] files =
curFolder.listFiles(PdsFolderResolver.DB_SUBFOLDERS_NEW_STYLE_FILTER);
@@ -220,9 +216,8 @@ public class FoldersReuseCompatibilityTest extends
IgnitePersistenceCompatibilit
* Checks existence of all storage-related directories
*
* @param subDirName sub directories name expected
- * @throws IgniteCheckedException if IO error occur
*/
- private void assertPdsDirsDefaultExist(String subDirName) throws
IgniteCheckedException {
+ private void assertPdsDirsDefaultExist(String subDirName) {
NodeFileTree ft = nodeFileTree(subDirName);
Consumer<File> check = dir -> assertTrue(dir.exists() &&
dir.isDirectory());
diff --git
a/modules/compatibility/src/test/java/org/apache/ignite/compatibility/persistence/IgnitePersistenceCompatibilityAbstractTest.java
b/modules/compatibility/src/test/java/org/apache/ignite/compatibility/persistence/IgnitePersistenceCompatibilityAbstractTest.java
index c0cfcb87a41..7211c957a73 100644
---
a/modules/compatibility/src/test/java/org/apache/ignite/compatibility/persistence/IgnitePersistenceCompatibilityAbstractTest.java
+++
b/modules/compatibility/src/test/java/org/apache/ignite/compatibility/persistence/IgnitePersistenceCompatibilityAbstractTest.java
@@ -20,29 +20,28 @@ package org.apache.ignite.compatibility.persistence;
import java.io.File;
import java.util.Arrays;
import java.util.List;
+import java.util.function.Consumer;
import
org.apache.ignite.compatibility.testframework.junits.IgniteCompatibilityAbstractTest;
import
org.apache.ignite.compatibility.testframework.util.CompatibilityTestsUtils;
import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.spi.checkpoint.sharedfs.SharedFsCheckpointSpi;
-import static
org.apache.ignite.internal.processors.cache.persistence.file.FilePageStoreManager.DFLT_STORE_DIR;
-import static
org.apache.ignite.internal.processors.cache.persistence.filename.SharedFileTree.BINARY_METADATA_DIR;
-import static
org.apache.ignite.internal.processors.cache.persistence.filename.SharedFileTree.MARSHALLER_DIR;
-
/**
* Super class for all persistence compatibility tests.
*/
public abstract class IgnitePersistenceCompatibilityAbstractTest extends
IgniteCompatibilityAbstractTest {
- /** Persistence directories. */
- private static final List<String> PERSISTENCE_DIRS
- = Arrays.asList(DFLT_STORE_DIR, BINARY_METADATA_DIR,
SharedFsCheckpointSpi.DFLT_ROOT, MARSHALLER_DIR);
-
/** {@inheritDoc} */
@Override protected void beforeTest() throws Exception {
super.beforeTest();
- for (String dirName : PERSISTENCE_DIRS) {
- File dir = U.resolveWorkDirectory(U.defaultWorkDirectory(),
dirName, true);
+ Consumer<File> recreate = dir -> {
+ U.delete(dir);
+
+ assertTrue(dir.mkdirs());
+ };
+
+ for (File dir : persistenceDirs()) {
+ recreate.accept(dir);
if (!CompatibilityTestsUtils.isDirectoryEmpty(dir)) {
throw new IllegalStateException("Directory is not empty and
can't be cleaned: " +
@@ -58,7 +57,16 @@ public abstract class
IgnitePersistenceCompatibilityAbstractTest extends IgniteC
//protection if test failed to finish, e.g. by error
stopAllGrids();
- for (String dir : PERSISTENCE_DIRS)
- U.delete(U.resolveWorkDirectory(U.defaultWorkDirectory(), dir,
false));
+ persistenceDirs().forEach(U::delete);
+ }
+
+ /** */
+ private List<File> persistenceDirs() {
+ return Arrays.asList(
+ sharedFileTree().db(),
+ sharedFileTree().binaryMetaRoot(),
+ sharedFileTree().marshaller(),
+ new File(sharedFileTree().root(),
SharedFsCheckpointSpi.DFLT_ROOT));
+
}
}
diff --git
a/modules/compress/src/test/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotCompressionBasicTest.java
b/modules/compress/src/test/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotCompressionBasicTest.java
index a2e08f928eb..ec30059964e 100644
---
a/modules/compress/src/test/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotCompressionBasicTest.java
+++
b/modules/compress/src/test/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotCompressionBasicTest.java
@@ -66,7 +66,6 @@ import org.mockito.Mockito;
import static org.apache.ignite.events.EventType.EVTS_CLUSTER_SNAPSHOT;
import static
org.apache.ignite.events.EventType.EVT_CLUSTER_SNAPSHOT_RESTORE_FINISHED;
import static
org.apache.ignite.events.EventType.EVT_CLUSTER_SNAPSHOT_RESTORE_STARTED;
-import static
org.apache.ignite.internal.processors.cache.persistence.file.FilePageStoreManager.DFLT_STORE_DIR;
/** */
public class SnapshotCompressionBasicTest extends AbstractSnapshotSelfTest {
@@ -403,7 +402,7 @@ public class SnapshotCompressionBasicTest extends
AbstractSnapshotSelfTest {
/** */
protected long persistenseSize(Collection<Ignite> grids) {
return grids.stream()
- .map(ig -> workingDirectory(ig).resolve(DFLT_STORE_DIR))
+ .map(ig ->
((IgniteEx)ig).context().pdsFolderResolver().fileTree().nodeStorage().toPath())
.reduce(0L, (acc, p) -> acc + directorySize(p), Long::sum);
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/file/FilePageStoreManager.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/file/FilePageStoreManager.java
index bfcf489561c..b656dafd767 100755
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/file/FilePageStoreManager.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/file/FilePageStoreManager.java
@@ -94,9 +94,6 @@ import static
org.apache.ignite.internal.processors.cache.persistence.metastorag
*/
public class FilePageStoreManager extends GridCacheSharedManagerAdapter
implements IgnitePageStoreManager,
PageStoreCollection {
- /** */
- public static final String DFLT_STORE_DIR = "db";
-
/** Matcher for searching of *.tmp files. */
public static final PathMatcher TMP_FILE_MATCHER =
FileSystems.getDefault().getPathMatcher("glob:**" + TMP_SUFFIX);
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/filename/NodeFileTree.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/filename/NodeFileTree.java
index e1b48abf7f8..9c64553ac5e 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/filename/NodeFileTree.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/filename/NodeFileTree.java
@@ -44,7 +44,6 @@ import static
org.apache.ignite.configuration.DataStorageConfiguration.DFLT_WAL_
import static
org.apache.ignite.internal.pagemem.PageIdAllocator.INDEX_PARTITION;
import static
org.apache.ignite.internal.pagemem.PageIdAllocator.MAX_PARTITION_ID;
import static
org.apache.ignite.internal.processors.cache.GridCacheUtils.UTILITY_CACHE_NAME;
-import static
org.apache.ignite.internal.processors.cache.persistence.filename.PdsFolderResolver.DB_DEFAULT_FOLDER;
import static
org.apache.ignite.internal.processors.cache.persistence.metastorage.MetaStorage.METASTORAGE_CACHE_NAME;
import static
org.apache.ignite.internal.processors.cache.persistence.metastorage.MetaStorage.METASTORAGE_DIR_NAME;
@@ -293,7 +292,7 @@ public class NodeFileTree extends SharedFileTree {
wal = rootRelative(DFLT_WAL_PATH);
walArchive = rootRelative(DFLT_WAL_ARCHIVE_PATH);
walCdc = rootRelative(DFLT_WAL_CDC_PATH);
- nodeStorage = rootRelative(DB_DEFAULT_FOLDER);
+ nodeStorage = rootRelative(DB_DIR);
snpTmpRoot = new File(nodeStorage, SNAPSHOT_TMP_DIR);
checkpoint = new File(nodeStorage, CHECKPOINT_DIR);
}
@@ -324,7 +323,7 @@ public class NodeFileTree extends SharedFileTree {
if (CU.isPersistenceEnabled(cfg) || CU.isCdcEnabled(cfg)) {
nodeStorage = dsCfg.getStoragePath() == null
- ? rootRelative(DB_DEFAULT_FOLDER)
+ ? rootRelative(DB_DIR)
: resolveDirectory(dsCfg.getStoragePath());
snpTmpRoot = new File(nodeStorage, SNAPSHOT_TMP_DIR);
checkpoint = new File(nodeStorage, CHECKPOINT_DIR);
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/filename/PdsFolderResolver.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/filename/PdsFolderResolver.java
index 1ed5c572b11..722dcf011ee 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/filename/PdsFolderResolver.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/filename/PdsFolderResolver.java
@@ -47,6 +47,7 @@ import org.jetbrains.annotations.Nullable;
import static java.lang.Boolean.TRUE;
import static
org.apache.ignite.IgniteSystemProperties.IGNITE_DATA_STORAGE_FOLDER_BY_CONSISTENT_ID;
import static org.apache.ignite.IgniteSystemProperties.getBoolean;
+import static
org.apache.ignite.internal.processors.cache.persistence.filename.SharedFileTree.DB_DIR;
/**
* This class contains logic to resolve and possibly lock PDS folder
@@ -91,9 +92,6 @@ public class PdsFolderResolver<L extends FileLockHolder> {
}
};
- /** Database default folder. */
- static final String DB_DEFAULT_FOLDER = "db";
-
/** */
private final IgniteConfiguration cfg;
@@ -433,7 +431,7 @@ public class PdsFolderResolver<L extends FileLockHolder> {
return U.resolveWorkDirectory(
cfg.getWorkDirectory(),
- pstPath != null ? pstPath : DB_DEFAULT_FOLDER,
+ pstPath != null ? pstPath : DB_DIR,
false
);
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/filename/SharedFileTree.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/filename/SharedFileTree.java
index 6fed0c5915b..15f0bd12b57 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/filename/SharedFileTree.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/filename/SharedFileTree.java
@@ -27,7 +27,6 @@ import org.apache.ignite.internal.util.typedef.internal.S;
import org.apache.ignite.internal.util.typedef.internal.U;
import static
org.apache.ignite.configuration.IgniteConfiguration.DFLT_SNAPSHOT_DIRECTORY;
-import static
org.apache.ignite.internal.processors.cache.persistence.filename.PdsFolderResolver.DB_DEFAULT_FOLDER;
/**
* Provides access to directories shared between all local nodes.
@@ -37,18 +36,21 @@ import static
org.apache.ignite.internal.processors.cache.persistence.filename.P
* ├── db
← db (shared between all local nodes).
* │ ├── binary_meta
← binaryMetaRoot (shared between all local nodes).
* │ ├── marshaller
← marshaller (shared between all local nodes).
- * └── snapshots
← snapshotRoot (shared between all local nodes).
+ * └── snapshots
← snpsRoot (shared between all local nodes).
* </pre>
*
* @see NodeFileTree
*/
public class SharedFileTree {
/** Name of binary metadata folder. */
- public static final String BINARY_METADATA_DIR = "binary_meta";
+ protected static final String BINARY_METADATA_DIR = "binary_meta";
/** Name of marshaller mappings folder. */
public static final String MARSHALLER_DIR = "marshaller";
+ /** Database default folder. */
+ protected static final String DB_DIR = "db";
+
/** Root(work) directory. */
protected final File root;
@@ -73,8 +75,8 @@ public class SharedFileTree {
String rootStr = root.getAbsolutePath();
- marshaller = Paths.get(rootStr, DB_DEFAULT_FOLDER,
MARSHALLER_DIR).toFile();
- binaryMetaRoot = Paths.get(rootStr, DB_DEFAULT_FOLDER,
BINARY_METADATA_DIR).toFile();
+ marshaller = Paths.get(rootStr, DB_DIR, MARSHALLER_DIR).toFile();
+ binaryMetaRoot = Paths.get(rootStr, DB_DIR,
BINARY_METADATA_DIR).toFile();
}
/**
@@ -105,6 +107,13 @@ public class SharedFileTree {
return root;
}
+ /**
+ * @return Path to the {@code db} directory inside {@link #root()}.
+ */
+ public File db() {
+ return new File(root, DB_DIR);
+ }
+
/**
* @return Path to common binary metadata directory. Note, directory can
contain data from several nodes.
* Each node will create own directory inside this root.
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 4951a831d1d..26dfde5c755 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
@@ -32,7 +32,6 @@ import org.apache.ignite.internal.IgniteEx;
import org.apache.ignite.internal.managers.encryption.GroupKey;
import org.apache.ignite.internal.processors.cache.IgniteInternalCache;
import org.apache.ignite.internal.util.typedef.internal.CU;
-import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.spi.encryption.keystore.KeystoreEncryptionKey;
import org.apache.ignite.testframework.GridTestUtils;
import org.junit.Test;
@@ -146,7 +145,7 @@ public class EncryptedCacheCreateTest extends
AbstractEncryptionTest {
final boolean[] plainBytesFound = {false};
- Files.walk(U.resolveWorkDirectory(U.defaultWorkDirectory(), "db",
false).toPath())
+ Files.walk(sharedFileTree().db().toPath())
.filter(Files::isRegularFile)
.forEach(f -> {
try {
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 b81f81817e1..5bb5a2c909a 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
@@ -25,7 +25,6 @@ import
org.apache.ignite.configuration.DataStorageConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.internal.processors.security.IgniteSecurity;
import org.apache.ignite.internal.processors.security.SecurityContext;
-import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.testframework.GridTestUtils;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
import org.junit.Test;
@@ -72,7 +71,7 @@ public class Authentication1kUsersNodeRestartTest extends
GridCommonAbstractTest
@Override protected void beforeTest() throws Exception {
super.beforeTest();
- U.resolveWorkDirectory(U.defaultWorkDirectory(), "db", true);
+ recreateDefaultDb();
}
/** {@inheritDoc} */
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 e79a791e8ff..bdeb69be3ad 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
@@ -25,7 +25,6 @@ import
org.apache.ignite.configuration.DataRegionConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
import
org.apache.ignite.internal.processors.security.impl.TestSecurityPluginProvider;
-import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.spi.IgniteSpiException;
import org.apache.ignite.testframework.GridTestUtils;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
@@ -87,7 +86,7 @@ public class AuthenticationConfigurationClusterTest extends
GridCommonAbstractTe
@Override protected void beforeTest() throws Exception {
super.beforeTest();
- U.resolveWorkDirectory(U.defaultWorkDirectory(), "db", true);
+ recreateDefaultDb();
}
/**
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 3a3495f65da..c6797501c38 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
@@ -72,7 +72,7 @@ public class AuthenticationOnNotActiveClusterTest extends
GridCommonAbstractTest
@Override protected void beforeTest() throws Exception {
super.beforeTest();
- U.resolveWorkDirectory(U.defaultWorkDirectory(), "db", true);
+ recreateDefaultDb();
}
/** {@inheritDoc} */
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/authentication/AuthenticationProcessorNPEOnStartTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/authentication/AuthenticationProcessorNPEOnStartTest.java
index 42dbf41d8e1..f652b04aa15 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/authentication/AuthenticationProcessorNPEOnStartTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/authentication/AuthenticationProcessorNPEOnStartTest.java
@@ -21,7 +21,6 @@ import java.util.concurrent.atomic.AtomicInteger;
import org.apache.ignite.configuration.DataRegionConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
-import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.testframework.GridTestUtils;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
import org.junit.Test;
@@ -48,7 +47,7 @@ public class AuthenticationProcessorNPEOnStartTest extends
GridCommonAbstractTes
@Override protected void beforeTest() throws Exception {
super.beforeTest();
- U.resolveWorkDirectory(U.defaultWorkDirectory(), "db", true);
+ recreateDefaultDb();
}
/** {@inheritDoc} */
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 d93638641ab..73401606f97 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
@@ -88,7 +88,7 @@ public class AuthenticationProcessorNodeRestartTest extends
GridCommonAbstractTe
@Override protected void beforeTest() throws Exception {
super.beforeTest();
- U.resolveWorkDirectory(U.defaultWorkDirectory(), "db", true);
+ recreateDefaultDb();
startGrids(NODES_COUNT - 1);
startClientGrid(CLI_NODE);
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 c0199a53165..3cc4cbc001e 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
@@ -109,7 +109,7 @@ public class AuthenticationProcessorSelfTest extends
GridCommonAbstractTest {
@Override protected void beforeTest() throws Exception {
super.beforeTest();
- U.resolveWorkDirectory(U.defaultWorkDirectory(), "db", true);
+ recreateDefaultDb();
startGrids(NODES_COUNT - 1);
startClientGrid(CLI_NODE);
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 0669ebcbc61..b8b1c9e8857 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
@@ -77,13 +77,13 @@ public class GridCacheRebalancingPartitionCountersTest
extends GridCommonAbstrac
/** {@inheritDoc} */
@Override protected void beforeTest() throws Exception {
stopAllGrids();
- U.delete(U.resolveWorkDirectory(U.defaultWorkDirectory(), "db",
false));
+ U.delete(sharedFileTree().db());
}
/** {@inheritDoc} */
@Override protected void afterTest() throws Exception {
stopAllGrids();
- U.delete(U.resolveWorkDirectory(U.defaultWorkDirectory(), "db",
false));
+ U.delete(sharedFileTree().db());
}
/**
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 b536f136081..90245509e5c 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
@@ -17,7 +17,6 @@
package org.apache.ignite.internal.processors.cache.persistence;
-import java.io.File;
import java.util.concurrent.Callable;
import org.apache.ignite.IgniteCache;
import org.apache.ignite.IgniteDataStreamer;
@@ -32,14 +31,13 @@ import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.configuration.WALMode;
import org.apache.ignite.internal.IgniteEx;
import org.apache.ignite.internal.IgniteInternalFuture;
+import
org.apache.ignite.internal.processors.cache.persistence.filename.SharedFileTree;
import org.apache.ignite.internal.util.typedef.G;
import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.testframework.GridTestUtils;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
import org.junit.Test;
-import static
org.apache.ignite.internal.processors.cache.persistence.file.FilePageStoreManager.DFLT_STORE_DIR;
-
/**
*
*/
@@ -75,7 +73,7 @@ public class IgnitePdsRemoveDuringRebalancingTest extends
GridCommonAbstractTest
cleanPersistenceDir();
- U.delete(new File(U.getIgniteHome(), DFLT_STORE_DIR));
+ U.delete(new SharedFileTree(U.getIgniteHome()).db());
}
/** {@inheritDoc} */
@@ -84,7 +82,7 @@ public class IgnitePdsRemoveDuringRebalancingTest extends
GridCommonAbstractTest
cleanPersistenceDir();
- U.delete(new File(U.getIgniteHome(), DFLT_STORE_DIR));
+ U.delete(new SharedFileTree(U.getIgniteHome()).db());
}
/**
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/LocalWalModeNoChangeDuringRebalanceOnNonNodeAssignTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/LocalWalModeNoChangeDuringRebalanceOnNonNodeAssignTest.java
index 4b876dc6c47..cea5c888b65 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/LocalWalModeNoChangeDuringRebalanceOnNonNodeAssignTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/LocalWalModeNoChangeDuringRebalanceOnNonNodeAssignTest.java
@@ -17,9 +17,9 @@
package org.apache.ignite.internal.processors.cache.persistence;
+import java.io.File;
import java.util.List;
import org.apache.ignite.Ignite;
-import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.IgniteDataStreamer;
import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.affinity.AffinityFunctionContext;
@@ -37,7 +37,6 @@ import
org.apache.ignite.internal.pagemem.wal.record.WALRecord;
import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
import org.apache.ignite.internal.processors.cache.persistence.wal.WALPointer;
import
org.apache.ignite.internal.processors.cache.persistence.wal.reader.IgniteWalIteratorFactory;
-import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.lang.IgniteBiTuple;
import org.apache.ignite.testframework.junits.WithSystemProperty;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
@@ -48,7 +47,6 @@ import static java.lang.String.valueOf;
import static
org.apache.ignite.IgniteSystemProperties.IGNITE_DISABLE_WAL_DURING_REBALANCING;
import static
org.apache.ignite.internal.pagemem.wal.record.WALRecord.RecordType.METASTORE_DATA_RECORD;
import static
org.apache.ignite.internal.processors.cache.GridCacheUtils.cacheId;
-import static
org.apache.ignite.internal.processors.cache.persistence.file.FilePageStoreManager.DFLT_STORE_DIR;
/**
*
@@ -167,27 +165,19 @@ public class
LocalWalModeNoChangeDuringRebalanceOnNonNodeAssignTest extends Grid
}
/**
- *
* @param nodeName Node name.
* @return Path to WAL work directory.
- * @throws IgniteCheckedException If failed.
*/
- private String walPath(String nodeName) throws IgniteCheckedException {
- String workDir = U.defaultWorkDirectory();
-
- return workDir + "/" + DFLT_STORE_DIR + "/" + nodeName + "/wal";
+ private String walPath(String nodeName) {
+ return new File(sharedFileTree().db(), nodeName +
"/wal").getAbsolutePath();
}
/**
- *
* @param nodeName Node name.
* @return Path to WAL archive directory.
- * @throws IgniteCheckedException If failed.
*/
- private String walArchivePath(String nodeName) throws
IgniteCheckedException {
- String workDir = U.defaultWorkDirectory();
-
- return workDir + "/" + DFLT_STORE_DIR + "/" + nodeName + "/walArchive";
+ private String walArchivePath(String nodeName) {
+ return new File(sharedFileTree().db(), nodeName +
"/walArchive").getAbsolutePath();
}
/**
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 8afc8fd288f..de52eeeb18e 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
@@ -63,8 +63,6 @@ import
org.apache.ignite.transactions.TransactionRollbackException;
import org.junit.Ignore;
import org.junit.Test;
-import static
org.apache.ignite.internal.processors.cache.persistence.file.FilePageStoreManager.DFLT_STORE_DIR;
-
/**
* Checks that client affinity assignment cache is calculated correctly
regardless of current baseline topology.
*/
@@ -125,7 +123,7 @@ public class ClientAffinityAssignmentWithBaselineTest
extends GridCommonAbstract
}
if (igniteInstanceName.contains(FLAKY_NODE_NAME)) {
- File store = U.resolveWorkDirectory(U.defaultWorkDirectory(),
DFLT_STORE_DIR, false);
+ File store = sharedFileTree().db();
cfg.getDataStorageConfiguration().setWalPath(new File(store,
FLAKY_WAL_PATH).getAbsolutePath());
cfg.getDataStorageConfiguration().setWalArchivePath(new
File(store, FLAKY_WAL_ARCHIVE_PATH).getAbsolutePath());
@@ -387,7 +385,7 @@ public class ClientAffinityAssignmentWithBaselineTest
extends GridCommonAbstract
awaitProgressInAllLoaders(10_000, loadError, threadProgressTracker);
- File store = U.resolveWorkDirectory(U.defaultWorkDirectory(),
DFLT_STORE_DIR, false);
+ File store = sharedFileTree().db();
U.delete(new File(store, FLAKY_WAL_PATH));
U.delete(new File(store, FLAKY_WAL_ARCHIVE_PATH));
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 125b4cd9ac6..479381e197d 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
@@ -61,8 +61,6 @@ import org.junit.Assert;
import org.junit.Ignore;
import org.junit.Test;
-import static
org.apache.ignite.internal.processors.cache.persistence.file.FilePageStoreManager.DFLT_STORE_DIR;
-
/**
* Sandbox test to measure progress of grid write operations. If no progress
occur during period of time, then thread
* dumps are generated.
@@ -130,9 +128,7 @@ public class IgniteMassLoadSandboxTest extends
GridCommonAbstractTest {
.setWriteThrottlingEnabled(true)
.setCheckpointFrequency(checkpointFrequency);
- final String workDir = U.defaultWorkDirectory();
- final File db = U.resolveWorkDirectory(workDir, DFLT_STORE_DIR, false);
- final File wal = new File(db, "wal");
+ final File wal = new File(sharedFileTree().db(), "wal");
if (setWalArchAndWorkToSameVal) {
final String walAbsPath = wal.getAbsolutePath();
@@ -164,7 +160,7 @@ public class IgniteMassLoadSandboxTest extends
GridCommonAbstractTest {
@Override protected void beforeTest() throws Exception {
stopAllGrids();
- U.delete(U.resolveWorkDirectory(U.defaultWorkDirectory(), "db",
false));
+ U.delete(sharedFileTree().db());
U.delete(U.resolveWorkDirectory(U.defaultWorkDirectory(), "temp",
false));
}
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 e1c935974ca..07647a8541a 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
@@ -32,7 +32,6 @@ import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.DataRegionConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
-import
org.apache.ignite.internal.processors.cache.persistence.file.FilePageStoreManager;
import
org.apache.ignite.internal.processors.cache.persistence.filename.NodeFileTree;
import
org.apache.ignite.internal.processors.cache.persistence.filename.PdsFolderResolver;
import org.apache.ignite.internal.util.typedef.internal.U;
@@ -103,16 +102,14 @@ public class IgniteUidAsConsistentIdMigrationTest extends
GridCommonAbstractTest
}
}
- /**
- * @throws IgniteCheckedException If failed.
- */
- private void deleteWorkFiles() throws IgniteCheckedException {
+ /** */
+ private void deleteWorkFiles() {
boolean ok = true;
if (pstStoreCustomPath != null)
ok &= U.delete(pstStoreCustomPath);
- else
- ok &= U.delete(U.resolveWorkDirectory(U.defaultWorkDirectory(),
FilePageStoreManager.DFLT_STORE_DIR, false));
+ else if (sharedFileTree().db().exists())
+ ok &= U.delete(sharedFileTree().db());
if (pstWalArchCustomPath != null)
ok &= U.delete(pstWalArchCustomPath);
@@ -611,7 +608,7 @@ public class IgniteUidAsConsistentIdMigrationTest extends
GridCommonAbstractTest
second.put((int)(Math.random() * entries), getClass().getName());
final String prevVerFolder =
U.maskForFileName(ignite.cluster().localNode().consistentId().toString());
- final String path = new File(new File(U.defaultWorkDirectory(), "db"),
prevVerFolder).getCanonicalPath();
+ final String path = new File(sharedFileTree().db(),
prevVerFolder).getCanonicalPath();
assertPdsDirsDefaultExist(ignite, prevVerFolder);
stopAllGrids();
@@ -652,18 +649,16 @@ public class IgniteUidAsConsistentIdMigrationTest extends
GridCommonAbstractTest
/**
* @param indexes expected new style node indexes in folders
- * @throws IgniteCheckedException if failed
*/
- private void assertNodeIndexesInFolder(Integer... indexes) throws
IgniteCheckedException {
+ private void assertNodeIndexesInFolder(Integer... indexes) {
assertEquals(new TreeSet<>(Arrays.asList(indexes)),
getAllNodeIndexesInFolder());
}
/**
* @return set of all indexes of nodes found in work folder
- * @throws IgniteCheckedException if failed.
*/
- @NotNull private Set<Integer> getAllNodeIndexesInFolder() throws
IgniteCheckedException {
- final File curFolder = new File(U.defaultWorkDirectory(),
FilePageStoreManager.DFLT_STORE_DIR);
+ @NotNull private Set<Integer> getAllNodeIndexesInFolder() {
+ final File curFolder = sharedFileTree().db();
final Set<Integer> indexes = new TreeSet<>();
final File[] files =
curFolder.listFiles(PdsFolderResolver.DB_SUBFOLDERS_NEW_STYLE_FILTER);
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 1555a3b67f7..7aa17a4aa13 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
@@ -70,6 +70,7 @@ import
org.apache.ignite.internal.processors.cache.CacheObject;
import org.apache.ignite.internal.processors.cache.GridCacheOperation;
import org.apache.ignite.internal.processors.cache.KeyCacheObject;
import
org.apache.ignite.internal.processors.cache.persistence.filename.NodeFileTree;
+import
org.apache.ignite.internal.processors.cache.persistence.filename.SharedFileTree;
import org.apache.ignite.internal.processors.cache.persistence.wal.WALPointer;
import
org.apache.ignite.internal.processors.cache.persistence.wal.reader.IgniteWalIteratorFactory;
import
org.apache.ignite.internal.processors.cache.persistence.wal.reader.IgniteWalIteratorFactory.IteratorParametersBuilder;
@@ -97,7 +98,6 @@ import static
org.apache.ignite.events.EventType.EVT_WAL_SEGMENT_COMPACTED;
import static
org.apache.ignite.internal.pagemem.wal.record.WALRecord.RecordType.DATA_RECORD_V2;
import static
org.apache.ignite.internal.processors.cache.GridCacheOperation.CREATE;
import static
org.apache.ignite.internal.processors.cache.GridCacheOperation.DELETE;
-import static
org.apache.ignite.internal.processors.cache.persistence.file.FilePageStoreManager.DFLT_STORE_DIR;
import static
org.apache.ignite.internal.processors.cache.persistence.filename.PdsFolderResolver.genNewStyleSubfolderName;
/**
@@ -175,8 +175,7 @@ public class IgniteWalReaderTest extends
GridCommonAbstractTest {
if (forceArchiveSegmentMs > 0)
dsCfg.setWalForceArchiveTimeout(forceArchiveSegmentMs);
- String workDir = U.defaultWorkDirectory();
- File db = U.resolveWorkDirectory(workDir, DFLT_STORE_DIR, false);
+ File db = sharedFileTree().db();
File wal = new File(db, "wal");
if (setWalAndArchiveToSameVal) {
@@ -230,15 +229,13 @@ public class IgniteWalReaderTest extends
GridCommonAbstractTest {
stopGrid();
- String workDir = U.defaultWorkDirectory();
-
- File db = U.resolveWorkDirectory(workDir, DFLT_STORE_DIR, false);
-
IgniteWalIteratorFactory factory = new IgniteWalIteratorFactory(log);
+ SharedFileTree sft = sharedFileTree();
+
IteratorParametersBuilder params =
- createIteratorParametersBuilder(workDir, subfolderName)
- .filesOrDirs(db);
+ createIteratorParametersBuilder(sft.root().getAbsolutePath(),
subfolderName)
+ .filesOrDirs(sft.db());
// Check iteratorArchiveDirectory and iteratorArchiveFiles are same.
int cntArchiveDir = iterateAndCount(factory.iterator(params));
diff --git
a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
index 3f063fe5ea6..c0ecfba59a8 100755
---
a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
@@ -17,6 +17,7 @@
package org.apache.ignite.testframework.junits;
+import java.io.File;
import java.io.ObjectStreamException;
import java.io.Serializable;
import java.lang.annotation.Annotation;
@@ -3186,6 +3187,17 @@ public abstract class GridAbstractTest extends
JUnitAssertAware {
return MBeanServerInvocationHandler.newProxyInstance(mbeanSrv,
mbeanName, clazz, false);
}
+ /**
+ * Recreates default db directory.
+ */
+ protected void recreateDefaultDb() {
+ File db = sharedFileTree().db();
+
+ U.delete(db);
+
+ assertTrue(db.mkdirs());
+ }
+
/**
* @return Ignite directories without specific {@code folerName} parameter.
*/
diff --git
a/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java
b/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java
index 11cab394765..ac138c271ea 100755
---
a/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java
@@ -159,7 +159,6 @@ import static
org.apache.ignite.cache.CacheRebalanceMode.NONE;
import static
org.apache.ignite.configuration.IgniteConfiguration.DFLT_NETWORK_TIMEOUT;
import static
org.apache.ignite.internal.processors.cache.GridCacheUtils.isNearEnabled;
import static
org.apache.ignite.internal.processors.cache.distributed.dht.topology.GridDhtPartitionState.OWNING;
-import static
org.apache.ignite.internal.processors.cache.persistence.file.FilePageStoreManager.DFLT_STORE_DIR;
import static org.apache.ignite.testframework.GridTestUtils.setFieldValue;
import static org.apache.ignite.testframework.GridTestUtils.waitForCondition;
import static
org.apache.ignite.transactions.TransactionConcurrency.PESSIMISTIC;
@@ -1973,10 +1972,10 @@ public abstract class GridCommonAbstractTest extends
GridAbstractTest {
assertTrue("Grids are not stopped", F.isEmpty(G.allGrids()));
U.delete(U.resolveWorkDirectory(U.defaultWorkDirectory(),
SharedFsCheckpointSpi.DFLT_ROOT, false));
- U.delete(U.resolveWorkDirectory(U.defaultWorkDirectory(),
DFLT_STORE_DIR, false));
SharedFileTree sft = sharedFileTree();
+ U.delete(sft.db());
U.delete(sft.marshaller());
U.delete(sft.binaryMetaRoot());
diff --git
a/modules/indexing/src/test/java/org/apache/ignite/client/SecurityTest.java
b/modules/indexing/src/test/java/org/apache/ignite/client/SecurityTest.java
index abcf1b9f455..3a9e4a7fd17 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/client/SecurityTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/client/SecurityTest.java
@@ -32,6 +32,7 @@ import
org.apache.ignite.configuration.ClientConnectorConfiguration;
import org.apache.ignite.configuration.DataRegionConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
+import
org.apache.ignite.internal.processors.cache.persistence.filename.SharedFileTree;
import
org.apache.ignite.internal.processors.platform.client.IgniteClientException;
import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.ssl.SslContextFactory;
@@ -62,7 +63,11 @@ public class SecurityTest {
*/
@Before
public void beforeEach() throws IgniteCheckedException {
- U.resolveWorkDirectory(U.defaultWorkDirectory(), "db", true);
+ SharedFileTree sft = new SharedFileTree(U.defaultWorkDirectory());
+
+ U.delete(sft.db());
+
+ assertTrue(sft.db().mkdirs());
}
/** Test SSL/TLS encryption. */
diff --git
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/authentication/SqlUserCommandSelfTest.java
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/authentication/SqlUserCommandSelfTest.java
index 666414c3661..1cf41f20f16 100644
---
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/authentication/SqlUserCommandSelfTest.java
+++
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/authentication/SqlUserCommandSelfTest.java
@@ -27,7 +27,6 @@ import org.apache.ignite.configuration.IgniteConfiguration;
import
org.apache.ignite.internal.processors.authentication.IgniteAccessControlException;
import
org.apache.ignite.internal.processors.authentication.UserManagementException;
import org.apache.ignite.internal.processors.security.SecurityContext;
-import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.testframework.GridTestUtils;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
import org.junit.Test;
@@ -67,7 +66,7 @@ public class SqlUserCommandSelfTest extends
GridCommonAbstractTest {
@Override protected void beforeTest() throws Exception {
super.beforeTest();
- U.resolveWorkDirectory(U.defaultWorkDirectory(), "db", true);
+ recreateDefaultDb();
startGrids(NODES_COUNT - 1);
diff --git
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/H2RowCachePageEvictionTest.java
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/H2RowCachePageEvictionTest.java
index 553fe985df3..d931ca9cec1 100644
---
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/H2RowCachePageEvictionTest.java
+++
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/H2RowCachePageEvictionTest.java
@@ -72,7 +72,7 @@ public class H2RowCachePageEvictionTest extends
AbstractIndexingCommonTest {
@Override protected void beforeTest() throws Exception {
super.beforeTest();
- U.resolveWorkDirectory(U.defaultWorkDirectory(), "db", true);
+ recreateDefaultDb();
U.resolveWorkDirectory(U.defaultWorkDirectory(), "wal", true);
}
