This is an automated email from the ASF dual-hosted git repository.
sanpwc pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/ignite-3.git
The following commit(s) were added to refs/heads/main by this push:
new 8cd06ffdc9 IGNITE-22955 Start local configuration before creating
other components (#4198)
8cd06ffdc9 is described below
commit 8cd06ffdc90c7e40eea5290fed917f7ecbe76e40
Author: Cyrill <[email protected]>
AuthorDate: Thu Aug 8 10:53:40 2024 +0300
IGNITE-22955 Start local configuration before creating other components
(#4198)
---
.../org/apache/ignite/internal/util/LazyPath.java | 80 ----------------------
.../replicator/ItReplicaLifecycleTest.java | 5 +-
.../java/org/apache/ignite/internal/raft/Loza.java | 4 +-
.../internal/raft/server/impl/JraftServerImpl.java | 7 +-
.../storage/impl/DefaultLogStorageFactory.java | 15 ++--
.../raft/storage/logit/LogitLogStorageFactory.java | 7 +-
.../raft/util/SharedLogStorageFactoryUtils.java | 4 +-
.../jraft/storage/impl/LogStorageBenchmark.java | 3 +-
.../jraft/storage/logit/LogitLogStorageTest.java | 3 +-
.../ignite/internal/raft/TestLozaFactory.java | 5 +-
.../raft/server/TestJraftServerFactory.java | 7 +-
.../ItNodeBootstrapConfigurationTest.java | 4 +-
.../configuration/ItNodeConfigurationFileTest.java | 4 +-
.../runner/app/ItIgniteNodeRestartTest.java | 7 +-
.../org/apache/ignite/internal/app/IgniteImpl.java | 11 ++-
.../configuration/ComponentWorkingDir.java | 23 +++----
.../ignite/internal/configuration/IgnitePaths.java | 12 ++--
.../ignite/internal/storage/DataStorageModule.java | 4 +-
.../internal/storage/DataStorageModules.java | 4 +-
.../internal/storage/DataStorageModulesTest.java | 3 +-
.../storage/impl/TestDataStorageModule.java | 4 +-
.../PersistentPageMemoryDataStorageModule.java | 4 +-
.../PersistentPageMemoryStorageEngine.java | 8 +--
.../VolatilePageMemoryDataStorageModule.java | 4 +-
.../PersistentPageMemoryMvTableStorageTest.java | 3 +-
.../PersistentPageMemoryStorageEngineTest.java | 3 +-
.../PersistentPageMemoryHashIndexStorageTest.java | 3 +-
...PersistentPageMemorySortedIndexStorageTest.java | 3 +-
...ageMemoryMvPartitionStorageConcurrencyTest.java | 3 +-
...rsistentPageMemoryMvPartitionStorageGcTest.java | 3 +-
...PersistentPageMemoryMvPartitionStorageTest.java | 3 +-
.../storage/rocksdb/RocksDbDataStorageModule.java | 4 +-
.../storage/rocksdb/RocksDbStorageEngine.java | 7 +-
.../RocksDbMvPartitionStorageConcurrencyTest.java | 3 +-
.../rocksdb/RocksDbMvPartitionStorageGcTest.java | 3 +-
.../rocksdb/RocksDbMvPartitionStorageTest.java | 3 +-
.../storage/rocksdb/RocksDbMvTableStorageTest.java | 3 +-
.../rocksdb/engine/RocksDbStorageEngineTest.java | 3 +-
.../rocksdb/index/RocksDbHashIndexStorageTest.java | 3 +-
.../index/RocksDbSortedIndexStorageTest.java | 3 +-
.../instance/SharedRocksDbInstanceTest.java | 3 +-
.../rebalance/ItRebalanceDistributedTest.java | 5 +-
.../internal/table/distributed/TableManager.java | 6 +-
.../distributed/TableManagerRecoveryTest.java | 11 ++-
.../table/distributed/TableManagerTest.java | 10 ++-
.../PersistentPageMemoryGcUpdateHandlerTest.java | 3 +-
.../distributed/gc/RocksDbGcUpdateHandlerTest.java | 3 +-
.../state/rocksdb/TxStateRocksDbSharedStorage.java | 11 ++-
.../state/rocksdb/RocksDbTxStateStorageTest.java | 3 +-
49 files changed, 108 insertions(+), 232 deletions(-)
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/util/LazyPath.java
b/modules/core/src/main/java/org/apache/ignite/internal/util/LazyPath.java
deleted file mode 100644
index 63ee1624ba..0000000000
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/LazyPath.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * 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.util;
-
-import java.nio.file.Path;
-import java.util.function.Supplier;
-
-/**
- * A {@link Lazy} for {@link Path}.
- *
- * <p>Use this class to defer initialization of {@link Path} until it is
needed.
- */
-public class LazyPath extends Lazy<Path> {
-
- private LazyPath(Supplier<Path> supplier) {
- super(supplier);
- }
-
- /**
- * Create a new instance for a path.
- *
- * @param defaultPath Path.
- */
- public static LazyPath create(Path defaultPath) {
- return new LazyPath(() -> defaultPath);
- }
-
- /**
- * Create a new instance from {@code pathSupplier} if it returns a
nonempty value, otherwise use {@code defaultPathSupplier}.
- *
- * @param pathSupplier Path supplier.
- * @param defaultPathSupplier Default path supplier.
- */
- public static LazyPath create(Supplier<String> pathSupplier,
Supplier<Path> defaultPathSupplier) {
- return new LazyPath(() -> pathOrDefault(pathSupplier.get(),
defaultPathSupplier));
- }
-
- /**
- * Resolve the other path against this one.
- */
- public LazyPath resolveLazy(Path other) {
- return new LazyPath(() -> get().resolve(other));
- }
-
- /**
- * Resolve the other path against this one.
- */
- public LazyPath resolveLazy(String other) {
- return new LazyPath(() -> get().resolve(other));
- }
-
- @Override
- public Path get() {
- return super.get();
- }
-
- private static Path pathOrDefault(String value, Supplier<Path>
defaultPathSupplier) {
- return value.isEmpty() ? defaultPathSupplier.get() : Path.of(value);
- }
-
- @Override
- public String toString() {
- return get().toString();
- }
-}
diff --git
a/modules/partition-replicator/src/integrationTest/java/org/apache/ignite/internal/partition/replicator/ItReplicaLifecycleTest.java
b/modules/partition-replicator/src/integrationTest/java/org/apache/ignite/internal/partition/replicator/ItReplicaLifecycleTest.java
index 26c01317b3..dc0ffdc3e3 100644
---
a/modules/partition-replicator/src/integrationTest/java/org/apache/ignite/internal/partition/replicator/ItReplicaLifecycleTest.java
+++
b/modules/partition-replicator/src/integrationTest/java/org/apache/ignite/internal/partition/replicator/ItReplicaLifecycleTest.java
@@ -180,7 +180,6 @@ import org.apache.ignite.internal.tx.impl.TxManagerImpl;
import org.apache.ignite.internal.tx.message.TxMessageGroup;
import org.apache.ignite.internal.tx.message.WriteIntentSwitchReplicaRequest;
import org.apache.ignite.internal.tx.test.TestLocalRwTxCounter;
-import org.apache.ignite.internal.util.LazyPath;
import org.apache.ignite.internal.vault.VaultManager;
import org.apache.ignite.network.ClusterNode;
import org.apache.ignite.network.NetworkAddress;
@@ -1054,7 +1053,7 @@ public class ItReplicaLifecycleTest extends
BaseIgniteAbstractTest {
dataStorageModules.createStorageEngines(
name,
nodeCfgMgr.configurationRegistry(),
- LazyPath.create(dir.resolve("storage")),
+ dir.resolve("storage"),
null,
failureProcessor,
logSyncer,
@@ -1163,7 +1162,7 @@ public class ItReplicaLifecycleTest extends
BaseIgniteAbstractTest {
replicaSvc,
txManager,
dataStorageMgr,
- LazyPath.create(storagePath),
+ storagePath,
metaStorageManager,
schemaManager,
threadPoolsManager.tableIoExecutor(),
diff --git
a/modules/raft/src/main/java/org/apache/ignite/internal/raft/Loza.java
b/modules/raft/src/main/java/org/apache/ignite/internal/raft/Loza.java
index 0543969734..f65750734c 100644
--- a/modules/raft/src/main/java/org/apache/ignite/internal/raft/Loza.java
+++ b/modules/raft/src/main/java/org/apache/ignite/internal/raft/Loza.java
@@ -20,6 +20,7 @@ package org.apache.ignite.internal.raft;
import static java.util.Objects.requireNonNullElse;
import static
org.apache.ignite.internal.util.CompletableFutures.nullCompletedFuture;
+import java.nio.file.Path;
import java.util.Set;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ScheduledExecutorService;
@@ -53,7 +54,6 @@ import
org.apache.ignite.internal.replicator.ReplicationGroupId;
import org.apache.ignite.internal.thread.NamedThreadFactory;
import org.apache.ignite.internal.util.IgniteSpinBusyLock;
import org.apache.ignite.internal.util.IgniteUtils;
-import org.apache.ignite.internal.util.LazyPath;
import org.apache.ignite.raft.jraft.RaftMessagesFactory;
import org.apache.ignite.raft.jraft.option.NodeOptions;
import org.apache.ignite.raft.jraft.rpc.impl.ActionRequestInterceptor;
@@ -117,7 +117,7 @@ public class Loza implements RaftManager {
ClusterService clusterNetSvc,
MetricManager metricManager,
RaftConfiguration raftConfiguration,
- LazyPath dataPath,
+ Path dataPath,
HybridClock clock,
RaftGroupEventsClientListener raftGroupEventsClientListener,
LogStorageFactory defaultLogStorageFactory
diff --git
a/modules/raft/src/main/java/org/apache/ignite/internal/raft/server/impl/JraftServerImpl.java
b/modules/raft/src/main/java/org/apache/ignite/internal/raft/server/impl/JraftServerImpl.java
index 5256a6653b..2c0ee7a116 100644
---
a/modules/raft/src/main/java/org/apache/ignite/internal/raft/server/impl/JraftServerImpl.java
+++
b/modules/raft/src/main/java/org/apache/ignite/internal/raft/server/impl/JraftServerImpl.java
@@ -65,7 +65,6 @@ import
org.apache.ignite.internal.raft.storage.impl.IgniteJraftServiceFactory;
import
org.apache.ignite.internal.raft.storage.impl.StripeAwareLogManager.Stripe;
import org.apache.ignite.internal.replicator.ReplicationGroupId;
import org.apache.ignite.internal.thread.IgniteThreadFactory;
-import org.apache.ignite.internal.util.LazyPath;
import org.apache.ignite.raft.jraft.Closure;
import org.apache.ignite.raft.jraft.Iterator;
import org.apache.ignite.raft.jraft.JRaftUtils;
@@ -108,7 +107,7 @@ public class JraftServerImpl implements RaftServer {
private final ClusterService service;
/** Data path. */
- private final LazyPath dataPath;
+ private final Path dataPath;
/** Log storage provider. */
private final LogStorageFactory logStorageFactory;
@@ -156,7 +155,7 @@ public class JraftServerImpl implements RaftServer {
*/
public JraftServerImpl(
ClusterService service,
- LazyPath dataPath,
+ Path dataPath,
NodeOptions opts,
RaftGroupEventsClientListener raftGroupEventsClientListener,
LogStorageFactory logStorageFactory
@@ -416,7 +415,7 @@ public class JraftServerImpl implements RaftServer {
* @return The path to persistence folder.
*/
public Path getServerDataPath(RaftNodeId nodeId) {
- return this.dataPath.get().resolve(nodeIdStr(nodeId));
+ return this.dataPath.resolve(nodeIdStr(nodeId));
}
private static String nodeIdStr(RaftNodeId nodeId) {
diff --git
a/modules/raft/src/main/java/org/apache/ignite/internal/raft/storage/impl/DefaultLogStorageFactory.java
b/modules/raft/src/main/java/org/apache/ignite/internal/raft/storage/impl/DefaultLogStorageFactory.java
index e94a7e207f..36babfa7c3 100644
---
a/modules/raft/src/main/java/org/apache/ignite/internal/raft/storage/impl/DefaultLogStorageFactory.java
+++
b/modules/raft/src/main/java/org/apache/ignite/internal/raft/storage/impl/DefaultLogStorageFactory.java
@@ -36,7 +36,6 @@ import org.apache.ignite.internal.manager.ComponentContext;
import org.apache.ignite.internal.raft.storage.LogStorageFactory;
import org.apache.ignite.internal.rocksdb.RocksUtils;
import org.apache.ignite.internal.thread.NamedThreadFactory;
-import org.apache.ignite.internal.util.LazyPath;
import org.apache.ignite.raft.jraft.option.RaftOptions;
import org.apache.ignite.raft.jraft.storage.LogStorage;
import org.apache.ignite.raft.jraft.util.ExecutorServiceHelper;
@@ -61,8 +60,8 @@ import org.rocksdb.util.SizeUnit;
public class DefaultLogStorageFactory implements LogStorageFactory {
private static final IgniteLogger LOG =
Loggers.forClass(DefaultLogStorageFactory.class);
- /** Function to get path to the log storage. */
- private final LazyPath lazyLogPath;
+ /** Path to the log storage. */
+ private final Path logPath;
/** Executor for shared storages. */
private final ExecutorService executorService;
@@ -99,16 +98,16 @@ public class DefaultLogStorageFactory implements
LogStorageFactory {
*/
@TestOnly
public DefaultLogStorageFactory(Path path) {
- this("test", LazyPath.create(path));
+ this("test", path);
}
/**
* Constructor.
*
- * @param lazyLogPath Function to get path to the log storage.
+ * @param logPath Function to get path to the log storage.
*/
- public DefaultLogStorageFactory(String nodeName, LazyPath lazyLogPath) {
- this.lazyLogPath = lazyLogPath;
+ public DefaultLogStorageFactory(String nodeName, Path logPath) {
+ this.logPath = logPath;
executorService = Executors.newSingleThreadExecutor(
NamedThreadFactory.create(nodeName,
"raft-shared-log-storage-pool", LOG)
@@ -127,8 +126,6 @@ public class DefaultLogStorageFactory implements
LogStorageFactory {
}
private void start() {
- Path logPath = lazyLogPath.get();
-
try {
Files.createDirectories(logPath);
} catch (IOException e) {
diff --git
a/modules/raft/src/main/java/org/apache/ignite/internal/raft/storage/logit/LogitLogStorageFactory.java
b/modules/raft/src/main/java/org/apache/ignite/internal/raft/storage/logit/LogitLogStorageFactory.java
index a27b4f5c73..2ca87823a9 100644
---
a/modules/raft/src/main/java/org/apache/ignite/internal/raft/storage/logit/LogitLogStorageFactory.java
+++
b/modules/raft/src/main/java/org/apache/ignite/internal/raft/storage/logit/LogitLogStorageFactory.java
@@ -30,7 +30,6 @@ import org.apache.ignite.internal.manager.ComponentContext;
import org.apache.ignite.internal.raft.storage.LogStorageFactory;
import org.apache.ignite.internal.thread.NamedThreadFactory;
import org.apache.ignite.internal.util.FeatureChecker;
-import org.apache.ignite.internal.util.LazyPath;
import org.apache.ignite.raft.jraft.option.RaftOptions;
import org.apache.ignite.raft.jraft.storage.LogStorage;
import org.apache.ignite.raft.jraft.storage.logit.option.StoreOptions;
@@ -54,7 +53,7 @@ public class LogitLogStorageFactory implements
LogStorageFactory {
private final StoreOptions storeOptions;
/** Base location of all log storages. */
- private final LazyPath logPath;
+ private final Path logPath;
/**
* Constructor.
@@ -62,7 +61,7 @@ public class LogitLogStorageFactory implements
LogStorageFactory {
* @param logPath Function to get base path of all log storages, created
by this factory.
* @param storeOptions Logit log storage options.
*/
- public LogitLogStorageFactory(String nodeName, StoreOptions storeOptions,
LazyPath logPath) {
+ public LogitLogStorageFactory(String nodeName, StoreOptions storeOptions,
Path logPath) {
this.logPath = logPath;
this.storeOptions = storeOptions;
checkpointExecutor = Executors.newSingleThreadScheduledExecutor(
@@ -108,6 +107,6 @@ public class LogitLogStorageFactory implements
LogStorageFactory {
/** Returns path to log storage by group ID. */
public Path resolveLogStoragePath(String groupId) {
- return logPath.get().resolve(LOG_DIR_PREFIX + groupId);
+ return logPath.resolve(LOG_DIR_PREFIX + groupId);
}
}
diff --git
a/modules/raft/src/main/java/org/apache/ignite/internal/raft/util/SharedLogStorageFactoryUtils.java
b/modules/raft/src/main/java/org/apache/ignite/internal/raft/util/SharedLogStorageFactoryUtils.java
index 7d68423a42..cac6c8e176 100644
---
a/modules/raft/src/main/java/org/apache/ignite/internal/raft/util/SharedLogStorageFactoryUtils.java
+++
b/modules/raft/src/main/java/org/apache/ignite/internal/raft/util/SharedLogStorageFactoryUtils.java
@@ -17,11 +17,11 @@
package org.apache.ignite.internal.raft.util;
+import java.nio.file.Path;
import org.apache.ignite.internal.lang.IgniteSystemProperties;
import org.apache.ignite.internal.raft.storage.LogStorageFactory;
import org.apache.ignite.internal.raft.storage.impl.DefaultLogStorageFactory;
import org.apache.ignite.internal.raft.storage.logit.LogitLogStorageFactory;
-import org.apache.ignite.internal.util.LazyPath;
import org.apache.ignite.raft.jraft.storage.logit.option.StoreOptions;
/** Utility methods for creating {@link LogStorageFactory}is for the Shared
Log. */
@@ -33,7 +33,7 @@ public class SharedLogStorageFactoryUtils {
public static final String LOGIT_STORAGE_ENABLED_PROPERTY =
"LOGIT_STORAGE_ENABLED";
/** Creates a LogStorageFactory with the {@link DefaultLogStorageFactory}
implementation. */
- public static LogStorageFactory create(String nodeName, LazyPath
lazyLogStoragePath) {
+ public static LogStorageFactory create(String nodeName, Path
lazyLogStoragePath) {
return
IgniteSystemProperties.getBoolean(LOGIT_STORAGE_ENABLED_PROPERTY, false)
? new LogitLogStorageFactory(nodeName, new StoreOptions(),
lazyLogStoragePath)
: new DefaultLogStorageFactory(nodeName, lazyLogStoragePath);
diff --git
a/modules/raft/src/test/java/org/apache/ignite/raft/jraft/storage/impl/LogStorageBenchmark.java
b/modules/raft/src/test/java/org/apache/ignite/raft/jraft/storage/impl/LogStorageBenchmark.java
index 905eb1ca1d..f0620c27b7 100644
---
a/modules/raft/src/test/java/org/apache/ignite/raft/jraft/storage/impl/LogStorageBenchmark.java
+++
b/modules/raft/src/test/java/org/apache/ignite/raft/jraft/storage/impl/LogStorageBenchmark.java
@@ -29,7 +29,6 @@ import org.apache.ignite.internal.manager.ComponentContext;
import org.apache.ignite.internal.raft.storage.LogStorageFactory;
import org.apache.ignite.internal.raft.storage.logit.LogitLogStorageFactory;
import org.apache.ignite.internal.util.IgniteUtils;
-import org.apache.ignite.internal.util.LazyPath;
import org.apache.ignite.raft.jraft.conf.ConfigurationManager;
import org.apache.ignite.raft.jraft.entity.EnumOutter;
import org.apache.ignite.raft.jraft.entity.LogEntry;
@@ -155,7 +154,7 @@ public class LogStorageBenchmark {
int totalLogs = 100 * 1024;
// LogStorageFactory logStorageFactory = new
DefaultLogStorageFactory(testPath);
- LogStorageFactory logStorageFactory = new
LogitLogStorageFactory("test", new StoreOptions(), LazyPath.create(testPath));
+ LogStorageFactory logStorageFactory = new
LogitLogStorageFactory("test", new StoreOptions(), testPath);
assertThat(logStorageFactory.startAsync(new ComponentContext()),
willCompleteSuccessfully());
try {
diff --git
a/modules/raft/src/test/java/org/apache/ignite/raft/jraft/storage/logit/LogitLogStorageTest.java
b/modules/raft/src/test/java/org/apache/ignite/raft/jraft/storage/logit/LogitLogStorageTest.java
index 2d11aa3e58..a5d90c6f26 100644
---
a/modules/raft/src/test/java/org/apache/ignite/raft/jraft/storage/logit/LogitLogStorageTest.java
+++
b/modules/raft/src/test/java/org/apache/ignite/raft/jraft/storage/logit/LogitLogStorageTest.java
@@ -26,7 +26,6 @@ import java.util.List;
import org.apache.ignite.internal.manager.ComponentContext;
import org.apache.ignite.internal.raft.storage.logit.LogitLogStorageFactory;
import org.apache.ignite.internal.testframework.WorkDirectoryExtension;
-import org.apache.ignite.internal.util.LazyPath;
import org.apache.ignite.raft.jraft.entity.EnumOutter;
import org.apache.ignite.raft.jraft.entity.LogEntry;
import org.apache.ignite.raft.jraft.option.RaftOptions;
@@ -50,7 +49,7 @@ public class LogitLogStorageTest extends BaseLogStorageTest {
@BeforeEach
@Override
public void setup() throws Exception {
- logStorageFactory = new LogitLogStorageFactory("test",
testStoreOptions(), LazyPath.create(path));
+ logStorageFactory = new LogitLogStorageFactory("test",
testStoreOptions(), path);
assertThat(logStorageFactory.startAsync(new ComponentContext()),
willCompleteSuccessfully());
super.setup();
diff --git
a/modules/raft/src/testFixtures/java/org/apache/ignite/internal/raft/TestLozaFactory.java
b/modules/raft/src/testFixtures/java/org/apache/ignite/internal/raft/TestLozaFactory.java
index 9162812763..93c0361fd8 100644
---
a/modules/raft/src/testFixtures/java/org/apache/ignite/internal/raft/TestLozaFactory.java
+++
b/modules/raft/src/testFixtures/java/org/apache/ignite/internal/raft/TestLozaFactory.java
@@ -27,7 +27,6 @@ import org.apache.ignite.internal.network.ClusterService;
import org.apache.ignite.internal.raft.configuration.RaftConfiguration;
import org.apache.ignite.internal.raft.storage.LogStorageFactory;
import org.apache.ignite.internal.raft.util.SharedLogStorageFactoryUtils;
-import org.apache.ignite.internal.util.LazyPath;
import org.apache.ignite.raft.jraft.rpc.impl.RaftGroupEventsClientListener;
/** Utilities for creating {@link Loza} instances. */
@@ -38,7 +37,7 @@ public class TestLozaFactory {
/**
* Factory method for {@link Loza}.
- * Uses the default logStorageFactory, {@link
SharedLogStorageFactoryUtils#create(String, LazyPath)},
+ * Uses the default logStorageFactory, {@link
SharedLogStorageFactoryUtils#create(String, Path)},
* and automatically wraps it in the Loza instance start/stop methods.
*
* @param clusterNetSvc Cluster network service.
@@ -57,7 +56,7 @@ public class TestLozaFactory {
/**
* Factory method for {@link Loza}.
- * Uses the default logStorageFactory, {@link
SharedLogStorageFactoryUtils#create(String, LazyPath)},
+ * Uses the default logStorageFactory, {@link
SharedLogStorageFactoryUtils#create(String, Path)},
* and automatically wraps it in the Loza instance start/stop methods.
*
* @param clusterNetSvc Cluster network service.
diff --git
a/modules/raft/src/testFixtures/java/org/apache/ignite/internal/raft/server/TestJraftServerFactory.java
b/modules/raft/src/testFixtures/java/org/apache/ignite/internal/raft/server/TestJraftServerFactory.java
index 95bf82e98d..f0922d518e 100644
---
a/modules/raft/src/testFixtures/java/org/apache/ignite/internal/raft/server/TestJraftServerFactory.java
+++
b/modules/raft/src/testFixtures/java/org/apache/ignite/internal/raft/server/TestJraftServerFactory.java
@@ -28,7 +28,6 @@ import org.apache.ignite.internal.network.ClusterService;
import org.apache.ignite.internal.raft.server.impl.JraftServerImpl;
import org.apache.ignite.internal.raft.storage.LogStorageFactory;
import org.apache.ignite.internal.raft.util.SharedLogStorageFactoryUtils;
-import org.apache.ignite.internal.util.LazyPath;
import org.apache.ignite.raft.jraft.option.NodeOptions;
import org.apache.ignite.raft.jraft.rpc.impl.RaftGroupEventsClientListener;
@@ -40,7 +39,7 @@ public class TestJraftServerFactory {
/**
* Factory method for {@link JraftServerImpl}.
- * Uses the default logStorageFactory, {@link
SharedLogStorageFactoryUtils#create(String, LazyPath)},
+ * Uses the default logStorageFactory, {@link
SharedLogStorageFactoryUtils#create(String, Path)},
* and automatically wraps it in the JraftServerImpl instance start/stop
methods.
*
* @param service Cluster service.
@@ -52,7 +51,7 @@ public class TestJraftServerFactory {
/**
* Factory method for {@link JraftServerImpl}.
- * Uses the default logStorageFactory, {@link
SharedLogStorageFactoryUtils#create(String, LazyPath)},
+ * Uses the default logStorageFactory, {@link
SharedLogStorageFactoryUtils#create(String, Path)},
* and automatically wraps it in the JraftServerImpl instance start/stop
methods.
*
* @param service Cluster service.
@@ -70,7 +69,7 @@ public class TestJraftServerFactory {
/**
* Factory method for {@link JraftServerImpl}.
- * Uses the default logStorageFactory, {@link
SharedLogStorageFactoryUtils#create(String, LazyPath)},
+ * Uses the default logStorageFactory, {@link
SharedLogStorageFactoryUtils#create(String, Path)},
* and automatically wraps it in the JraftServerImpl instance start/stop
methods.
*
* @param service Cluster service.
diff --git
a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/configuration/ItNodeBootstrapConfigurationTest.java
b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/configuration/ItNodeBootstrapConfigurationTest.java
index 43945ad100..f003efbfdc 100644
---
a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/configuration/ItNodeBootstrapConfigurationTest.java
+++
b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/configuration/ItNodeBootstrapConfigurationTest.java
@@ -53,9 +53,9 @@ public class ItNodeBootstrapConfigurationTest {
IgniteException.class,
() -> TestIgnitionManager.start(testNodeName(testInfo, 0),
config, workDir)
);
- assertThat(igniteException.getCause(),
is(instanceOf(NodeConfigParseException.class)));
+ assertThat(igniteException,
is(instanceOf(NodeConfigParseException.class)));
assertThat(
- igniteException.getCause().getMessage(),
+ igniteException.getMessage(),
containsString("Failed to parse config content from file " +
workDir.resolve(TestIgnitionManager.DEFAULT_CONFIG_NAME))
);
}
diff --git
a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/configuration/ItNodeConfigurationFileTest.java
b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/configuration/ItNodeConfigurationFileTest.java
index c70400fe6a..b91495ba79 100644
---
a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/configuration/ItNodeConfigurationFileTest.java
+++
b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/configuration/ItNodeConfigurationFileTest.java
@@ -50,8 +50,8 @@ public class ItNodeConfigurationFileTest {
IgniteException.class,
() -> TestIgnitionManager.start(testNodeName(testInfo, 0),
config, workDir)
);
- assertThat(igniteException.getCause(),
is(instanceOf(NodeConfigParseException.class)));
- assertThat(igniteException.getCause().getMessage(),
containsString("Failed to parse config content from file "));
+ assertThat(igniteException,
is(instanceOf(NodeConfigParseException.class)));
+ assertThat(igniteException.getMessage(), containsString("Failed to
parse config content from file "));
}
@Test
diff --git
a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/ItIgniteNodeRestartTest.java
b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/ItIgniteNodeRestartTest.java
index b9b40a6aa0..f8bdaa5b6b 100644
---
a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/ItIgniteNodeRestartTest.java
+++
b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/ItIgniteNodeRestartTest.java
@@ -212,7 +212,6 @@ import org.apache.ignite.internal.tx.message.TxMessageGroup;
import org.apache.ignite.internal.tx.test.TestLocalRwTxCounter;
import org.apache.ignite.internal.util.ByteUtils;
import org.apache.ignite.internal.util.Cursor;
-import org.apache.ignite.internal.util.LazyPath;
import org.apache.ignite.internal.vault.VaultManager;
import org.apache.ignite.internal.worker.CriticalWorkerWatchdog;
import
org.apache.ignite.internal.worker.configuration.CriticalWorkersConfiguration;
@@ -594,13 +593,11 @@ public class ItIgniteNodeRestartTest extends
BaseIgniteRestartTest {
LogSyncer logSyncer = logStorageFactory;
- LazyPath lazyStoragePath = LazyPath.create(storagePath);
-
DataStorageManager dataStorageManager = new DataStorageManager(
dataStorageModules.createStorageEngines(
name,
nodeCfgMgr.configurationRegistry(),
- lazyStoragePath,
+ storagePath,
null,
failureProcessor,
logSyncer,
@@ -662,7 +659,7 @@ public class ItIgniteNodeRestartTest extends
BaseIgniteRestartTest {
replicaService,
txManager,
dataStorageManager,
- lazyStoragePath,
+ storagePath,
metaStorageMgr,
schemaManager,
threadPoolsManager.tableIoExecutor(),
diff --git
a/modules/runner/src/main/java/org/apache/ignite/internal/app/IgniteImpl.java
b/modules/runner/src/main/java/org/apache/ignite/internal/app/IgniteImpl.java
index 589e961fc9..6bd97ade48 100644
---
a/modules/runner/src/main/java/org/apache/ignite/internal/app/IgniteImpl.java
+++
b/modules/runner/src/main/java/org/apache/ignite/internal/app/IgniteImpl.java
@@ -235,7 +235,6 @@ import
org.apache.ignite.internal.tx.impl.TransactionIdGenerator;
import org.apache.ignite.internal.tx.impl.TransactionInflights;
import org.apache.ignite.internal.tx.impl.TxManagerImpl;
import org.apache.ignite.internal.tx.message.TxMessageGroup;
-import org.apache.ignite.internal.util.LazyPath;
import org.apache.ignite.internal.vault.VaultManager;
import org.apache.ignite.internal.vault.persistence.PersistentVaultService;
import org.apache.ignite.internal.worker.CriticalWorkerWatchdog;
@@ -463,6 +462,13 @@ public class IgniteImpl implements Ignite {
localConfigurationValidator
);
+ // Start local configuration to be able to read all local properties.
+ try {
+ lifecycleManager.startComponentsAsync(new ComponentContext(),
nodeCfgMgr);
+ } catch (NodeStoppingException e) {
+ assert false : "Unexpected exception: " + e;
+ }
+
ConfigurationRegistry nodeConfigRegistry =
nodeCfgMgr.configurationRegistry();
NetworkConfiguration networkConfiguration =
nodeConfigRegistry.getConfiguration(NetworkConfiguration.KEY);
@@ -690,7 +696,7 @@ public class IgniteImpl implements Ignite {
ServiceLoader.load(DataStorageModule.class,
serviceProviderClassLoader)
);
- LazyPath storagePath = partitionsWorkDir.dbPath();
+ Path storagePath = partitionsWorkDir.dbPath();
GcConfiguration gcConfig =
clusterConfigRegistry.getConfiguration(GcConfiguration.KEY);
@@ -1105,7 +1111,6 @@ public class IgniteImpl implements Ignite {
componentContext,
longJvmPauseDetector,
vaultMgr,
- nodeCfgMgr,
threadPoolsManager,
clockWaiter,
failureProcessor,
diff --git
a/modules/runner/src/main/java/org/apache/ignite/internal/configuration/ComponentWorkingDir.java
b/modules/runner/src/main/java/org/apache/ignite/internal/configuration/ComponentWorkingDir.java
index 71ae0b60cc..0b618888df 100644
---
a/modules/runner/src/main/java/org/apache/ignite/internal/configuration/ComponentWorkingDir.java
+++
b/modules/runner/src/main/java/org/apache/ignite/internal/configuration/ComponentWorkingDir.java
@@ -20,7 +20,6 @@ package org.apache.ignite.internal.configuration;
import java.nio.file.Path;
import java.nio.file.Paths;
-import org.apache.ignite.internal.util.LazyPath;
/**
* Working dir subtree structure representation for components.
@@ -41,41 +40,37 @@ public class ComponentWorkingDir {
*/
private static final Path METADATA_PATH = Paths.get("meta");
- private final LazyPath basePath;
-
- public ComponentWorkingDir(LazyPath basePath) {
- this.basePath = basePath;
- }
+ private final Path basePath;
public ComponentWorkingDir(Path basePath) {
- this(LazyPath.create(basePath));
+ this.basePath = basePath;
}
/**
* Returns base path for the component.
*/
- public LazyPath basePath() {
+ public Path basePath() {
return basePath;
}
/**
* Returns metadata path for the component. A subdirectory in the base
path.
*/
- public LazyPath metaPath() {
- return basePath.resolveLazy(METADATA_PATH);
+ public Path metaPath() {
+ return basePath.resolve(METADATA_PATH);
}
/**
* Returns raft log path for the component. A subdirectory in the base
path.
*/
- public LazyPath raftLogPath() {
- return basePath.resolveLazy(RAFT_LOG_PATH);
+ public Path raftLogPath() {
+ return basePath.resolve(RAFT_LOG_PATH);
}
/**
* Returns storage path for the component. A subdirectory in the base path.
*/
- public LazyPath dbPath() {
- return basePath.resolveLazy(STORAGE_PATH);
+ public Path dbPath() {
+ return basePath.resolve(STORAGE_PATH);
}
}
diff --git
a/modules/runner/src/main/java/org/apache/ignite/internal/configuration/IgnitePaths.java
b/modules/runner/src/main/java/org/apache/ignite/internal/configuration/IgnitePaths.java
index efbcea104b..fe6df3da39 100644
---
a/modules/runner/src/main/java/org/apache/ignite/internal/configuration/IgnitePaths.java
+++
b/modules/runner/src/main/java/org/apache/ignite/internal/configuration/IgnitePaths.java
@@ -22,7 +22,6 @@ import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.function.Supplier;
import org.apache.ignite.configuration.ConfigurationValue;
-import org.apache.ignite.internal.util.LazyPath;
/**
* Manages storage paths for Ignite.
@@ -58,12 +57,12 @@ public class IgnitePaths {
* @return Working dir subtree structure representation for partitions.
*/
public static ComponentWorkingDir partitionsPath(SystemLocalConfiguration
systemConfiguration, Path workDir) {
- LazyPath basePath = lazy(systemConfiguration.partitionsBasePath(), ()
-> workDir.resolve(PARTITIONS_BASE_PATH));
+ Path basePath =
pathOrDefault(systemConfiguration.partitionsBasePath(), () ->
workDir.resolve(PARTITIONS_BASE_PATH));
return new ComponentWorkingDir(basePath) {
@Override
- public LazyPath raftLogPath() {
- return lazy(systemConfiguration.partitionsLogPath(), () ->
super.raftLogPath().get());
+ public Path raftLogPath() {
+ return pathOrDefault(systemConfiguration.partitionsLogPath(),
super::raftLogPath);
}
};
}
@@ -99,7 +98,8 @@ public class IgnitePaths {
// No-op.
}
- private static LazyPath lazy(ConfigurationValue<String> value,
Supplier<Path> defaultPath) {
- return LazyPath.create(value::value, defaultPath);
+ private static Path pathOrDefault(ConfigurationValue<String> value,
Supplier<Path> defaultPathSupplier) {
+ String valueStr = value.value();
+ return valueStr.isEmpty() ? defaultPathSupplier.get() :
Path.of(valueStr);
}
}
diff --git
a/modules/storage-api/src/main/java/org/apache/ignite/internal/storage/DataStorageModule.java
b/modules/storage-api/src/main/java/org/apache/ignite/internal/storage/DataStorageModule.java
index f058f44269..a97fcb692c 100644
---
a/modules/storage-api/src/main/java/org/apache/ignite/internal/storage/DataStorageModule.java
+++
b/modules/storage-api/src/main/java/org/apache/ignite/internal/storage/DataStorageModule.java
@@ -17,6 +17,7 @@
package org.apache.ignite.internal.storage;
+import java.nio.file.Path;
import org.apache.ignite.internal.components.LogSyncer;
import org.apache.ignite.internal.components.LongJvmPauseDetector;
import org.apache.ignite.internal.configuration.ConfigurationRegistry;
@@ -24,7 +25,6 @@ import org.apache.ignite.internal.failure.FailureProcessor;
import org.apache.ignite.internal.hlc.HybridClock;
import
org.apache.ignite.internal.storage.configurations.StorageProfileConfiguration;
import org.apache.ignite.internal.storage.engine.StorageEngine;
-import org.apache.ignite.internal.util.LazyPath;
import org.jetbrains.annotations.Nullable;
/**
@@ -53,7 +53,7 @@ public interface DataStorageModule {
StorageEngine createEngine(
String igniteInstanceName,
ConfigurationRegistry configRegistry,
- LazyPath storagePath,
+ Path storagePath,
@Nullable LongJvmPauseDetector longJvmPauseDetector,
FailureProcessor failureProcessor,
LogSyncer logSyncer,
diff --git
a/modules/storage-api/src/main/java/org/apache/ignite/internal/storage/DataStorageModules.java
b/modules/storage-api/src/main/java/org/apache/ignite/internal/storage/DataStorageModules.java
index 6f46c66faf..b2b6369cc7 100644
---
a/modules/storage-api/src/main/java/org/apache/ignite/internal/storage/DataStorageModules.java
+++
b/modules/storage-api/src/main/java/org/apache/ignite/internal/storage/DataStorageModules.java
@@ -19,6 +19,7 @@ package org.apache.ignite.internal.storage;
import static java.util.stream.Collectors.toUnmodifiableMap;
+import java.nio.file.Path;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -29,7 +30,6 @@ import
org.apache.ignite.internal.configuration.ConfigurationRegistry;
import org.apache.ignite.internal.failure.FailureProcessor;
import org.apache.ignite.internal.hlc.HybridClock;
import org.apache.ignite.internal.storage.engine.StorageEngine;
-import org.apache.ignite.internal.util.LazyPath;
import org.jetbrains.annotations.Nullable;
/**
@@ -84,7 +84,7 @@ public class DataStorageModules {
public Map<String, StorageEngine> createStorageEngines(
String igniteInstanceName,
ConfigurationRegistry configRegistry,
- LazyPath storagePath,
+ Path storagePath,
@Nullable LongJvmPauseDetector longJvmPauseDetector,
FailureProcessor failureProcessor,
LogSyncer logSyncer,
diff --git
a/modules/storage-api/src/test/java/org/apache/ignite/internal/storage/DataStorageModulesTest.java
b/modules/storage-api/src/test/java/org/apache/ignite/internal/storage/DataStorageModulesTest.java
index 12f875114d..7f09d43fff 100644
---
a/modules/storage-api/src/test/java/org/apache/ignite/internal/storage/DataStorageModulesTest.java
+++
b/modules/storage-api/src/test/java/org/apache/ignite/internal/storage/DataStorageModulesTest.java
@@ -38,7 +38,6 @@ import
org.apache.ignite.internal.storage.engine.StorageEngine;
import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.apache.ignite.internal.testframework.WorkDirectory;
import org.apache.ignite.internal.testframework.WorkDirectoryExtension;
-import org.apache.ignite.internal.util.LazyPath;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
@@ -79,7 +78,7 @@ public class DataStorageModulesTest extends
BaseIgniteAbstractTest {
Map<String, StorageEngine> engines =
dataStorageModules.createStorageEngines(
"test",
mock(ConfigurationRegistry.class),
- LazyPath.create(workDir),
+ workDir,
null,
mock(FailureProcessor.class),
mock(LogSyncer.class),
diff --git
a/modules/storage-api/src/testFixtures/java/org/apache/ignite/internal/storage/impl/TestDataStorageModule.java
b/modules/storage-api/src/testFixtures/java/org/apache/ignite/internal/storage/impl/TestDataStorageModule.java
index c390fef8b3..299186637a 100644
---
a/modules/storage-api/src/testFixtures/java/org/apache/ignite/internal/storage/impl/TestDataStorageModule.java
+++
b/modules/storage-api/src/testFixtures/java/org/apache/ignite/internal/storage/impl/TestDataStorageModule.java
@@ -20,6 +20,7 @@ package org.apache.ignite.internal.storage.impl;
import static
org.apache.ignite.internal.storage.impl.TestStorageEngine.ENGINE_NAME;
import com.google.auto.service.AutoService;
+import java.nio.file.Path;
import org.apache.ignite.internal.components.LogSyncer;
import org.apache.ignite.internal.components.LongJvmPauseDetector;
import org.apache.ignite.internal.configuration.ConfigurationRegistry;
@@ -28,7 +29,6 @@ import org.apache.ignite.internal.hlc.HybridClock;
import org.apache.ignite.internal.storage.DataStorageModule;
import org.apache.ignite.internal.storage.StorageException;
import org.apache.ignite.internal.storage.engine.StorageEngine;
-import org.apache.ignite.internal.util.LazyPath;
import org.jetbrains.annotations.Nullable;
/**
@@ -45,7 +45,7 @@ public class TestDataStorageModule implements
DataStorageModule {
public StorageEngine createEngine(
String igniteInstanceName,
ConfigurationRegistry configRegistry,
- LazyPath storagePath,
+ Path storagePath,
@Nullable LongJvmPauseDetector longJvmPauseDetector,
FailureProcessor failureProcessor,
LogSyncer logSyncer,
diff --git
a/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/PersistentPageMemoryDataStorageModule.java
b/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/PersistentPageMemoryDataStorageModule.java
index 6dc56bbad4..c7b0bf43a9 100644
---
a/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/PersistentPageMemoryDataStorageModule.java
+++
b/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/PersistentPageMemoryDataStorageModule.java
@@ -20,6 +20,7 @@ package org.apache.ignite.internal.storage.pagememory;
import static
org.apache.ignite.internal.storage.pagememory.PersistentPageMemoryStorageEngine.ENGINE_NAME;
import com.google.auto.service.AutoService;
+import java.nio.file.Path;
import org.apache.ignite.internal.components.LogSyncer;
import org.apache.ignite.internal.components.LongJvmPauseDetector;
import org.apache.ignite.internal.configuration.ConfigurationRegistry;
@@ -32,7 +33,6 @@ import
org.apache.ignite.internal.storage.configurations.StorageConfiguration;
import org.apache.ignite.internal.storage.engine.StorageEngine;
import
org.apache.ignite.internal.storage.pagememory.configuration.schema.PersistentPageMemoryStorageEngineConfiguration;
import
org.apache.ignite.internal.storage.pagememory.configuration.schema.PersistentPageMemoryStorageEngineExtensionConfiguration;
-import org.apache.ignite.internal.util.LazyPath;
import org.jetbrains.annotations.Nullable;
/**
@@ -49,7 +49,7 @@ public class PersistentPageMemoryDataStorageModule implements
DataStorageModule
public StorageEngine createEngine(
String igniteInstanceName,
ConfigurationRegistry configRegistry,
- LazyPath storagePath,
+ Path storagePath,
@Nullable LongJvmPauseDetector longJvmPauseDetector,
FailureProcessor failureProcessor,
LogSyncer logSyncer,
diff --git
a/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/PersistentPageMemoryStorageEngine.java
b/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/PersistentPageMemoryStorageEngine.java
index 96df62fd0e..6d445a013f 100644
---
a/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/PersistentPageMemoryStorageEngine.java
+++
b/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/PersistentPageMemoryStorageEngine.java
@@ -54,7 +54,6 @@ import
org.apache.ignite.internal.storage.engine.StorageTableDescriptor;
import org.apache.ignite.internal.storage.index.StorageIndexDescriptorSupplier;
import
org.apache.ignite.internal.storage.pagememory.configuration.schema.PersistentPageMemoryStorageEngineConfiguration;
import org.apache.ignite.internal.thread.NamedThreadFactory;
-import org.apache.ignite.internal.util.LazyPath;
import org.jetbrains.annotations.Nullable;
/** Storage engine implementation based on {@link PersistentPageMemory}. */
@@ -79,7 +78,7 @@ public class PersistentPageMemoryStorageEngine extends
AbstractPageMemoryStorage
private final PageIoRegistry ioRegistry;
- private final LazyPath storagePath;
+ private final Path storagePath;
@Nullable
private final LongJvmPauseDetector longJvmPauseDetector;
@@ -119,7 +118,7 @@ public class PersistentPageMemoryStorageEngine extends
AbstractPageMemoryStorage
PersistentPageMemoryStorageEngineConfiguration engineConfig,
StorageConfiguration storageConfig,
PageIoRegistry ioRegistry,
- LazyPath storagePath,
+ Path storagePath,
@Nullable LongJvmPauseDetector longJvmPauseDetector,
FailureProcessor failureProcessor,
LogSyncer logSyncer,
@@ -158,8 +157,7 @@ public class PersistentPageMemoryStorageEngine extends
AbstractPageMemoryStorage
? new AsyncFileIoFactory()
: new RandomAccessFileIoFactory();
- filePageStoreManager =
- createFilePageStoreManager(igniteInstanceName,
storagePath.get(), fileIoFactory, pageSize, failureProcessor);
+ filePageStoreManager =
createFilePageStoreManager(igniteInstanceName, storagePath, fileIoFactory,
pageSize, failureProcessor);
filePageStoreManager.start();
} catch (IgniteInternalCheckedException e) {
diff --git
a/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/VolatilePageMemoryDataStorageModule.java
b/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/VolatilePageMemoryDataStorageModule.java
index 6213abe24e..944a064240 100644
---
a/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/VolatilePageMemoryDataStorageModule.java
+++
b/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/VolatilePageMemoryDataStorageModule.java
@@ -20,6 +20,7 @@ package org.apache.ignite.internal.storage.pagememory;
import static
org.apache.ignite.internal.storage.pagememory.VolatilePageMemoryStorageEngine.ENGINE_NAME;
import com.google.auto.service.AutoService;
+import java.nio.file.Path;
import org.apache.ignite.internal.components.LogSyncer;
import org.apache.ignite.internal.components.LongJvmPauseDetector;
import org.apache.ignite.internal.configuration.ConfigurationRegistry;
@@ -32,7 +33,6 @@ import
org.apache.ignite.internal.storage.configurations.StorageConfiguration;
import org.apache.ignite.internal.storage.engine.StorageEngine;
import
org.apache.ignite.internal.storage.pagememory.configuration.schema.VolatilePageMemoryStorageEngineConfiguration;
import
org.apache.ignite.internal.storage.pagememory.configuration.schema.VolatilePageMemoryStorageEngineExtensionConfiguration;
-import org.apache.ignite.internal.util.LazyPath;
import org.jetbrains.annotations.Nullable;
/**
@@ -49,7 +49,7 @@ public class VolatilePageMemoryDataStorageModule implements
DataStorageModule {
public StorageEngine createEngine(
String igniteInstanceName,
ConfigurationRegistry configRegistry,
- LazyPath storagePath,
+ Path storagePath,
@Nullable LongJvmPauseDetector longJvmPauseDetector,
FailureProcessor failureProcessor,
LogSyncer logSyncer,
diff --git
a/modules/storage-page-memory/src/test/java/org/apache/ignite/internal/storage/pagememory/PersistentPageMemoryMvTableStorageTest.java
b/modules/storage-page-memory/src/test/java/org/apache/ignite/internal/storage/pagememory/PersistentPageMemoryMvTableStorageTest.java
index 31bcff45b0..e904140934 100644
---
a/modules/storage-page-memory/src/test/java/org/apache/ignite/internal/storage/pagememory/PersistentPageMemoryMvTableStorageTest.java
+++
b/modules/storage-page-memory/src/test/java/org/apache/ignite/internal/storage/pagememory/PersistentPageMemoryMvTableStorageTest.java
@@ -41,7 +41,6 @@ import
org.apache.ignite.internal.storage.pagememory.configuration.schema.Persis
import org.apache.ignite.internal.testframework.WorkDirectory;
import org.apache.ignite.internal.testframework.WorkDirectoryExtension;
import org.apache.ignite.internal.util.IgniteUtils;
-import org.apache.ignite.internal.util.LazyPath;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -72,7 +71,7 @@ public class PersistentPageMemoryMvTableStorageTest extends
AbstractMvTableStora
engineConfig,
storageConfig,
ioRegistry,
- LazyPath.create(workDir),
+ workDir,
null,
mock(FailureProcessor.class),
mock(LogSyncer.class),
diff --git
a/modules/storage-page-memory/src/test/java/org/apache/ignite/internal/storage/pagememory/engine/PersistentPageMemoryStorageEngineTest.java
b/modules/storage-page-memory/src/test/java/org/apache/ignite/internal/storage/pagememory/engine/PersistentPageMemoryStorageEngineTest.java
index 3518c33299..e0491d3a73 100644
---
a/modules/storage-page-memory/src/test/java/org/apache/ignite/internal/storage/pagememory/engine/PersistentPageMemoryStorageEngineTest.java
+++
b/modules/storage-page-memory/src/test/java/org/apache/ignite/internal/storage/pagememory/engine/PersistentPageMemoryStorageEngineTest.java
@@ -30,7 +30,6 @@ import
org.apache.ignite.internal.storage.pagememory.PersistentPageMemoryStorage
import
org.apache.ignite.internal.storage.pagememory.configuration.schema.PersistentPageMemoryStorageEngineConfiguration;
import org.apache.ignite.internal.testframework.WorkDirectory;
import org.apache.ignite.internal.testframework.WorkDirectoryExtension;
-import org.apache.ignite.internal.util.LazyPath;
import org.junit.jupiter.api.extension.ExtendWith;
/**
@@ -58,7 +57,7 @@ public class PersistentPageMemoryStorageEngineTest extends
AbstractStorageEngine
engineConfig,
storageConfig,
ioRegistry,
- LazyPath.create(workDir),
+ workDir,
null,
mock(FailureProcessor.class),
logSyncer,
diff --git
a/modules/storage-page-memory/src/test/java/org/apache/ignite/internal/storage/pagememory/index/PersistentPageMemoryHashIndexStorageTest.java
b/modules/storage-page-memory/src/test/java/org/apache/ignite/internal/storage/pagememory/index/PersistentPageMemoryHashIndexStorageTest.java
index 02130c4ef0..3403711e83 100644
---
a/modules/storage-page-memory/src/test/java/org/apache/ignite/internal/storage/pagememory/index/PersistentPageMemoryHashIndexStorageTest.java
+++
b/modules/storage-page-memory/src/test/java/org/apache/ignite/internal/storage/pagememory/index/PersistentPageMemoryHashIndexStorageTest.java
@@ -35,7 +35,6 @@ import
org.apache.ignite.internal.storage.pagememory.PersistentPageMemoryStorage
import
org.apache.ignite.internal.storage.pagememory.configuration.schema.PersistentPageMemoryStorageEngineConfiguration;
import org.apache.ignite.internal.testframework.WorkDirectory;
import org.apache.ignite.internal.testframework.WorkDirectoryExtension;
-import org.apache.ignite.internal.util.LazyPath;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.extension.ExtendWith;
@@ -65,7 +64,7 @@ class PersistentPageMemoryHashIndexStorageTest extends
AbstractPageMemoryHashInd
engineConfig,
storageConfig,
ioRegistry,
- LazyPath.create(workDir),
+ workDir,
null,
mock(FailureProcessor.class),
mock(LogSyncer.class),
diff --git
a/modules/storage-page-memory/src/test/java/org/apache/ignite/internal/storage/pagememory/index/PersistentPageMemorySortedIndexStorageTest.java
b/modules/storage-page-memory/src/test/java/org/apache/ignite/internal/storage/pagememory/index/PersistentPageMemorySortedIndexStorageTest.java
index 3673baee71..2e0640fca4 100644
---
a/modules/storage-page-memory/src/test/java/org/apache/ignite/internal/storage/pagememory/index/PersistentPageMemorySortedIndexStorageTest.java
+++
b/modules/storage-page-memory/src/test/java/org/apache/ignite/internal/storage/pagememory/index/PersistentPageMemorySortedIndexStorageTest.java
@@ -35,7 +35,6 @@ import
org.apache.ignite.internal.storage.pagememory.PersistentPageMemoryStorage
import
org.apache.ignite.internal.storage.pagememory.configuration.schema.PersistentPageMemoryStorageEngineConfiguration;
import org.apache.ignite.internal.testframework.WorkDirectory;
import org.apache.ignite.internal.testframework.WorkDirectoryExtension;
-import org.apache.ignite.internal.util.LazyPath;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.extension.ExtendWith;
@@ -64,7 +63,7 @@ class PersistentPageMemorySortedIndexStorageTest extends
AbstractPageMemorySorte
engineConfig,
storageConfig,
ioRegistry,
- LazyPath.create(workDir),
+ workDir,
null,
mock(FailureProcessor.class),
mock(LogSyncer.class),
diff --git
a/modules/storage-page-memory/src/test/java/org/apache/ignite/internal/storage/pagememory/mv/PersistentPageMemoryMvPartitionStorageConcurrencyTest.java
b/modules/storage-page-memory/src/test/java/org/apache/ignite/internal/storage/pagememory/mv/PersistentPageMemoryMvPartitionStorageConcurrencyTest.java
index e34dfe1e75..f3da9bf91e 100644
---
a/modules/storage-page-memory/src/test/java/org/apache/ignite/internal/storage/pagememory/mv/PersistentPageMemoryMvPartitionStorageConcurrencyTest.java
+++
b/modules/storage-page-memory/src/test/java/org/apache/ignite/internal/storage/pagememory/mv/PersistentPageMemoryMvPartitionStorageConcurrencyTest.java
@@ -36,7 +36,6 @@ import
org.apache.ignite.internal.storage.pagememory.configuration.schema.Persis
import org.apache.ignite.internal.testframework.WorkDirectory;
import org.apache.ignite.internal.testframework.WorkDirectoryExtension;
import org.apache.ignite.internal.util.IgniteUtils;
-import org.apache.ignite.internal.util.LazyPath;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.extension.ExtendWith;
@@ -64,7 +63,7 @@ class PersistentPageMemoryMvPartitionStorageConcurrencyTest
extends AbstractMvPa
engineConfig,
storageConfig,
ioRegistry,
- LazyPath.create(workDir),
+ workDir,
null,
mock(FailureProcessor.class),
mock(LogSyncer.class),
diff --git
a/modules/storage-page-memory/src/test/java/org/apache/ignite/internal/storage/pagememory/mv/PersistentPageMemoryMvPartitionStorageGcTest.java
b/modules/storage-page-memory/src/test/java/org/apache/ignite/internal/storage/pagememory/mv/PersistentPageMemoryMvPartitionStorageGcTest.java
index 80c03806eb..6f5f97a581 100644
---
a/modules/storage-page-memory/src/test/java/org/apache/ignite/internal/storage/pagememory/mv/PersistentPageMemoryMvPartitionStorageGcTest.java
+++
b/modules/storage-page-memory/src/test/java/org/apache/ignite/internal/storage/pagememory/mv/PersistentPageMemoryMvPartitionStorageGcTest.java
@@ -36,7 +36,6 @@ import
org.apache.ignite.internal.storage.pagememory.configuration.schema.Persis
import org.apache.ignite.internal.testframework.WorkDirectory;
import org.apache.ignite.internal.testframework.WorkDirectoryExtension;
import org.apache.ignite.internal.util.IgniteUtils;
-import org.apache.ignite.internal.util.LazyPath;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.extension.ExtendWith;
@@ -64,7 +63,7 @@ class PersistentPageMemoryMvPartitionStorageGcTest extends
AbstractMvPartitionSt
engineConfig,
storageConfig,
ioRegistry,
- LazyPath.create(workDir),
+ workDir,
null,
mock(FailureProcessor.class),
mock(LogSyncer.class),
diff --git
a/modules/storage-page-memory/src/test/java/org/apache/ignite/internal/storage/pagememory/mv/PersistentPageMemoryMvPartitionStorageTest.java
b/modules/storage-page-memory/src/test/java/org/apache/ignite/internal/storage/pagememory/mv/PersistentPageMemoryMvPartitionStorageTest.java
index 8d5d1ebad9..b9c42ec411 100644
---
a/modules/storage-page-memory/src/test/java/org/apache/ignite/internal/storage/pagememory/mv/PersistentPageMemoryMvPartitionStorageTest.java
+++
b/modules/storage-page-memory/src/test/java/org/apache/ignite/internal/storage/pagememory/mv/PersistentPageMemoryMvPartitionStorageTest.java
@@ -44,7 +44,6 @@ import
org.apache.ignite.internal.storage.pagememory.configuration.schema.Persis
import org.apache.ignite.internal.testframework.WorkDirectory;
import org.apache.ignite.internal.testframework.WorkDirectoryExtension;
import org.apache.ignite.internal.util.IgniteUtils;
-import org.apache.ignite.internal.util.LazyPath;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -76,7 +75,7 @@ class PersistentPageMemoryMvPartitionStorageTest extends
AbstractPageMemoryMvPar
engineConfig,
storageConfig,
ioRegistry,
- LazyPath.create(workDir),
+ workDir,
null,
mock(FailureProcessor.class),
mock(LogSyncer.class),
diff --git
a/modules/storage-rocksdb/src/main/java/org/apache/ignite/internal/storage/rocksdb/RocksDbDataStorageModule.java
b/modules/storage-rocksdb/src/main/java/org/apache/ignite/internal/storage/rocksdb/RocksDbDataStorageModule.java
index 6d410fc87b..d8e9f7d344 100644
---
a/modules/storage-rocksdb/src/main/java/org/apache/ignite/internal/storage/rocksdb/RocksDbDataStorageModule.java
+++
b/modules/storage-rocksdb/src/main/java/org/apache/ignite/internal/storage/rocksdb/RocksDbDataStorageModule.java
@@ -20,6 +20,7 @@ package org.apache.ignite.internal.storage.rocksdb;
import static
org.apache.ignite.internal.storage.rocksdb.RocksDbStorageEngine.ENGINE_NAME;
import com.google.auto.service.AutoService;
+import java.nio.file.Path;
import org.apache.ignite.internal.components.LogSyncer;
import org.apache.ignite.internal.components.LongJvmPauseDetector;
import org.apache.ignite.internal.configuration.ConfigurationRegistry;
@@ -31,7 +32,6 @@ import
org.apache.ignite.internal.storage.configurations.StorageConfiguration;
import org.apache.ignite.internal.storage.engine.StorageEngine;
import
org.apache.ignite.internal.storage.rocksdb.configuration.schema.RocksDbStorageEngineConfiguration;
import
org.apache.ignite.internal.storage.rocksdb.configuration.schema.RocksDbStorageEngineExtensionConfiguration;
-import org.apache.ignite.internal.util.LazyPath;
import org.jetbrains.annotations.Nullable;
/**
@@ -48,7 +48,7 @@ public class RocksDbDataStorageModule implements
DataStorageModule {
public StorageEngine createEngine(
String igniteInstanceName,
ConfigurationRegistry configRegistry,
- LazyPath storagePath,
+ Path storagePath,
@Nullable LongJvmPauseDetector longJvmPauseDetector,
FailureProcessor failureProcessor,
LogSyncer logSyncer,
diff --git
a/modules/storage-rocksdb/src/main/java/org/apache/ignite/internal/storage/rocksdb/RocksDbStorageEngine.java
b/modules/storage-rocksdb/src/main/java/org/apache/ignite/internal/storage/rocksdb/RocksDbStorageEngine.java
index 428eedbafe..75003c9327 100644
---
a/modules/storage-rocksdb/src/main/java/org/apache/ignite/internal/storage/rocksdb/RocksDbStorageEngine.java
+++
b/modules/storage-rocksdb/src/main/java/org/apache/ignite/internal/storage/rocksdb/RocksDbStorageEngine.java
@@ -40,7 +40,6 @@ import
org.apache.ignite.internal.storage.rocksdb.instance.SharedRocksDbInstance
import
org.apache.ignite.internal.storage.rocksdb.instance.SharedRocksDbInstanceCreator;
import org.apache.ignite.internal.thread.NamedThreadFactory;
import org.apache.ignite.internal.util.IgniteUtils;
-import org.apache.ignite.internal.util.LazyPath;
import org.rocksdb.RocksDB;
/**
@@ -76,7 +75,7 @@ public class RocksDbStorageEngine implements StorageEngine {
private final StorageConfiguration storageConfiguration;
- private final LazyPath storagePath;
+ private final Path storagePath;
private final ExecutorService threadPool;
@@ -102,7 +101,7 @@ public class RocksDbStorageEngine implements StorageEngine {
String nodeName,
RocksDbStorageEngineConfiguration engineConfig,
StorageConfiguration storageConfiguration,
- LazyPath storagePath,
+ Path storagePath,
LogSyncer logSyncer
) {
this.engineConfig = engineConfig;
@@ -175,7 +174,7 @@ public class RocksDbStorageEngine implements StorageEngine {
}
private SharedRocksDbInstance newRocksDbInstance(String profileName,
RocksDbStorageProfile profile) {
- Path dbPath = storagePath.get().resolve("rocksdb-" + profileName);
+ Path dbPath = storagePath.resolve("rocksdb-" + profileName);
try {
return new SharedRocksDbInstanceCreator().create(this, profile,
dbPath);
diff --git
a/modules/storage-rocksdb/src/test/java/org/apache/ignite/internal/storage/rocksdb/RocksDbMvPartitionStorageConcurrencyTest.java
b/modules/storage-rocksdb/src/test/java/org/apache/ignite/internal/storage/rocksdb/RocksDbMvPartitionStorageConcurrencyTest.java
index 88a51c78cf..fd4bb95a14 100644
---
a/modules/storage-rocksdb/src/test/java/org/apache/ignite/internal/storage/rocksdb/RocksDbMvPartitionStorageConcurrencyTest.java
+++
b/modules/storage-rocksdb/src/test/java/org/apache/ignite/internal/storage/rocksdb/RocksDbMvPartitionStorageConcurrencyTest.java
@@ -31,7 +31,6 @@ import
org.apache.ignite.internal.storage.rocksdb.configuration.schema.RocksDbSt
import org.apache.ignite.internal.testframework.WorkDirectory;
import org.apache.ignite.internal.testframework.WorkDirectoryExtension;
import org.apache.ignite.internal.util.IgniteUtils;
-import org.apache.ignite.internal.util.LazyPath;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.extension.ExtendWith;
@@ -53,7 +52,7 @@ public class RocksDbMvPartitionStorageConcurrencyTest extends
AbstractMvPartitio
@InjectConfiguration("mock.profiles.default = {engine = rocksdb,
size = 16777216, writeBufferSize = 16777216}")
StorageConfiguration storageConfiguration
) {
- engine = new RocksDbStorageEngine("test", engineConfig,
storageConfiguration, LazyPath.create(workDir), mock(LogSyncer.class));
+ engine = new RocksDbStorageEngine("test", engineConfig,
storageConfiguration, workDir, mock(LogSyncer.class));
engine.start();
diff --git
a/modules/storage-rocksdb/src/test/java/org/apache/ignite/internal/storage/rocksdb/RocksDbMvPartitionStorageGcTest.java
b/modules/storage-rocksdb/src/test/java/org/apache/ignite/internal/storage/rocksdb/RocksDbMvPartitionStorageGcTest.java
index 2cc5b0f5e9..21b714beb6 100644
---
a/modules/storage-rocksdb/src/test/java/org/apache/ignite/internal/storage/rocksdb/RocksDbMvPartitionStorageGcTest.java
+++
b/modules/storage-rocksdb/src/test/java/org/apache/ignite/internal/storage/rocksdb/RocksDbMvPartitionStorageGcTest.java
@@ -31,7 +31,6 @@ import
org.apache.ignite.internal.storage.rocksdb.configuration.schema.RocksDbSt
import org.apache.ignite.internal.testframework.WorkDirectory;
import org.apache.ignite.internal.testframework.WorkDirectoryExtension;
import org.apache.ignite.internal.util.IgniteUtils;
-import org.apache.ignite.internal.util.LazyPath;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.extension.ExtendWith;
@@ -53,7 +52,7 @@ public class RocksDbMvPartitionStorageGcTest extends
AbstractMvPartitionStorageG
@InjectConfiguration("mock.profiles.default = {engine = rocksdb,
size = 16777216, writeBufferSize = 16777216}")
StorageConfiguration storageConfiguration
) {
- engine = new RocksDbStorageEngine("test", engineConfig,
storageConfiguration, LazyPath.create(workDir), mock(LogSyncer.class));
+ engine = new RocksDbStorageEngine("test", engineConfig,
storageConfiguration, workDir, mock(LogSyncer.class));
engine.start();
diff --git
a/modules/storage-rocksdb/src/test/java/org/apache/ignite/internal/storage/rocksdb/RocksDbMvPartitionStorageTest.java
b/modules/storage-rocksdb/src/test/java/org/apache/ignite/internal/storage/rocksdb/RocksDbMvPartitionStorageTest.java
index 2571c80876..1562fda94a 100644
---
a/modules/storage-rocksdb/src/test/java/org/apache/ignite/internal/storage/rocksdb/RocksDbMvPartitionStorageTest.java
+++
b/modules/storage-rocksdb/src/test/java/org/apache/ignite/internal/storage/rocksdb/RocksDbMvPartitionStorageTest.java
@@ -31,7 +31,6 @@ import
org.apache.ignite.internal.storage.rocksdb.configuration.schema.RocksDbSt
import org.apache.ignite.internal.testframework.WorkDirectory;
import org.apache.ignite.internal.testframework.WorkDirectoryExtension;
import org.apache.ignite.internal.util.IgniteUtils;
-import org.apache.ignite.internal.util.LazyPath;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.extension.ExtendWith;
@@ -53,7 +52,7 @@ public class RocksDbMvPartitionStorageTest extends
AbstractMvPartitionStorageTes
@InjectConfiguration("mock.profiles.default = {engine = rocksdb,
size = 16777216, writeBufferSize = 16777216}")
StorageConfiguration storageConfiguration
) {
- engine = new RocksDbStorageEngine("test", engineConfig,
storageConfiguration, LazyPath.create(workDir), mock(LogSyncer.class));
+ engine = new RocksDbStorageEngine("test", engineConfig,
storageConfiguration, workDir, mock(LogSyncer.class));
engine.start();
diff --git
a/modules/storage-rocksdb/src/test/java/org/apache/ignite/internal/storage/rocksdb/RocksDbMvTableStorageTest.java
b/modules/storage-rocksdb/src/test/java/org/apache/ignite/internal/storage/rocksdb/RocksDbMvTableStorageTest.java
index 91a2186487..52f90af41d 100644
---
a/modules/storage-rocksdb/src/test/java/org/apache/ignite/internal/storage/rocksdb/RocksDbMvTableStorageTest.java
+++
b/modules/storage-rocksdb/src/test/java/org/apache/ignite/internal/storage/rocksdb/RocksDbMvTableStorageTest.java
@@ -41,7 +41,6 @@ import
org.apache.ignite.internal.storage.rocksdb.configuration.schema.RocksDbSt
import org.apache.ignite.internal.testframework.WorkDirectory;
import org.apache.ignite.internal.testframework.WorkDirectoryExtension;
import org.apache.ignite.internal.util.IgniteUtils;
-import org.apache.ignite.internal.util.LazyPath;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -62,7 +61,7 @@ public class RocksDbMvTableStorageTest extends
AbstractMvTableStorageTest {
@InjectConfiguration("mock.profiles.default {engine = rocksdb,
size = 16777216, writeBufferSize = 16777216}")
StorageConfiguration storageConfiguration
) {
- engine = new RocksDbStorageEngine("test", engineConfig,
storageConfiguration, LazyPath.create(workDir), mock(LogSyncer.class));
+ engine = new RocksDbStorageEngine("test", engineConfig,
storageConfiguration, workDir, mock(LogSyncer.class));
engine.start();
diff --git
a/modules/storage-rocksdb/src/test/java/org/apache/ignite/internal/storage/rocksdb/engine/RocksDbStorageEngineTest.java
b/modules/storage-rocksdb/src/test/java/org/apache/ignite/internal/storage/rocksdb/engine/RocksDbStorageEngineTest.java
index d2588a9f66..77904b0f15 100644
---
a/modules/storage-rocksdb/src/test/java/org/apache/ignite/internal/storage/rocksdb/engine/RocksDbStorageEngineTest.java
+++
b/modules/storage-rocksdb/src/test/java/org/apache/ignite/internal/storage/rocksdb/engine/RocksDbStorageEngineTest.java
@@ -26,7 +26,6 @@ import
org.apache.ignite.internal.storage.rocksdb.RocksDbStorageEngine;
import
org.apache.ignite.internal.storage.rocksdb.configuration.schema.RocksDbStorageEngineConfiguration;
import org.apache.ignite.internal.testframework.WorkDirectory;
import org.apache.ignite.internal.testframework.WorkDirectoryExtension;
-import org.apache.ignite.internal.util.LazyPath;
import org.junit.jupiter.api.extension.ExtendWith;
/**
@@ -49,7 +48,7 @@ public class RocksDbStorageEngineTest extends
AbstractStorageEngineTest {
"test",
engineConfiguration,
storageConfiguration,
- LazyPath.create(workDir),
+ workDir,
logSyncer
);
}
diff --git
a/modules/storage-rocksdb/src/test/java/org/apache/ignite/internal/storage/rocksdb/index/RocksDbHashIndexStorageTest.java
b/modules/storage-rocksdb/src/test/java/org/apache/ignite/internal/storage/rocksdb/index/RocksDbHashIndexStorageTest.java
index 7b8bcd1c4b..024ac7572f 100644
---
a/modules/storage-rocksdb/src/test/java/org/apache/ignite/internal/storage/rocksdb/index/RocksDbHashIndexStorageTest.java
+++
b/modules/storage-rocksdb/src/test/java/org/apache/ignite/internal/storage/rocksdb/index/RocksDbHashIndexStorageTest.java
@@ -33,7 +33,6 @@ import
org.apache.ignite.internal.storage.rocksdb.RocksDbStorageEngine;
import
org.apache.ignite.internal.storage.rocksdb.configuration.schema.RocksDbStorageEngineConfiguration;
import org.apache.ignite.internal.testframework.WorkDirectory;
import org.apache.ignite.internal.testframework.WorkDirectoryExtension;
-import org.apache.ignite.internal.util.LazyPath;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.extension.ExtendWith;
@@ -54,7 +53,7 @@ public class RocksDbHashIndexStorageTest extends
AbstractHashIndexStorageTest {
@InjectConfiguration("mock.profiles.default = {engine = rocksdb,
size = 16777216, writeBufferSize = 16777216}")
StorageConfiguration storageConfiguration
) {
- engine = new RocksDbStorageEngine("test", engineConfig,
storageConfiguration, LazyPath.create(workDir), mock(LogSyncer.class));
+ engine = new RocksDbStorageEngine("test", engineConfig,
storageConfiguration, workDir, mock(LogSyncer.class));
engine.start();
diff --git
a/modules/storage-rocksdb/src/test/java/org/apache/ignite/internal/storage/rocksdb/index/RocksDbSortedIndexStorageTest.java
b/modules/storage-rocksdb/src/test/java/org/apache/ignite/internal/storage/rocksdb/index/RocksDbSortedIndexStorageTest.java
index eb0ddd8775..043998e049 100644
---
a/modules/storage-rocksdb/src/test/java/org/apache/ignite/internal/storage/rocksdb/index/RocksDbSortedIndexStorageTest.java
+++
b/modules/storage-rocksdb/src/test/java/org/apache/ignite/internal/storage/rocksdb/index/RocksDbSortedIndexStorageTest.java
@@ -33,7 +33,6 @@ import
org.apache.ignite.internal.storage.rocksdb.RocksDbStorageEngine;
import
org.apache.ignite.internal.storage.rocksdb.configuration.schema.RocksDbStorageEngineConfiguration;
import org.apache.ignite.internal.testframework.WorkDirectory;
import org.apache.ignite.internal.testframework.WorkDirectoryExtension;
-import org.apache.ignite.internal.util.LazyPath;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.extension.ExtendWith;
@@ -54,7 +53,7 @@ public class RocksDbSortedIndexStorageTest extends
AbstractSortedIndexStorageTes
@InjectConfiguration("mock.profiles.default = {engine = rocksdb,
size = 16777216, writeBufferSize = 16777216}")
StorageConfiguration storageConfiguration
) {
- engine = new RocksDbStorageEngine("test", engineConfig,
storageConfiguration, LazyPath.create(workDir), mock(LogSyncer.class));
+ engine = new RocksDbStorageEngine("test", engineConfig,
storageConfiguration, workDir, mock(LogSyncer.class));
engine.start();
diff --git
a/modules/storage-rocksdb/src/test/java/org/apache/ignite/internal/storage/rocksdb/instance/SharedRocksDbInstanceTest.java
b/modules/storage-rocksdb/src/test/java/org/apache/ignite/internal/storage/rocksdb/instance/SharedRocksDbInstanceTest.java
index 90b312327c..2c72278daf 100644
---
a/modules/storage-rocksdb/src/test/java/org/apache/ignite/internal/storage/rocksdb/instance/SharedRocksDbInstanceTest.java
+++
b/modules/storage-rocksdb/src/test/java/org/apache/ignite/internal/storage/rocksdb/instance/SharedRocksDbInstanceTest.java
@@ -56,7 +56,6 @@ import
org.apache.ignite.internal.storage.rocksdb.configuration.schema.RocksDbSt
import org.apache.ignite.internal.testframework.IgniteAbstractTest;
import org.apache.ignite.internal.type.NativeTypes;
import org.apache.ignite.internal.util.IgniteUtils;
-import org.apache.ignite.internal.util.LazyPath;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.RepeatedTest;
@@ -81,7 +80,7 @@ class SharedRocksDbInstanceTest extends IgniteAbstractTest {
StorageConfiguration storageConfiguration,
@InjectConfiguration RocksDbStorageEngineConfiguration engineConfig
) throws Exception {
- engine = new RocksDbStorageEngine("test", engineConfig,
storageConfiguration, LazyPath.create(workDir), mock(LogSyncer.class));
+ engine = new RocksDbStorageEngine("test", engineConfig,
storageConfiguration, workDir, mock(LogSyncer.class));
engine.start();
diff --git
a/modules/table/src/integrationTest/java/org/apache/ignite/internal/rebalance/ItRebalanceDistributedTest.java
b/modules/table/src/integrationTest/java/org/apache/ignite/internal/rebalance/ItRebalanceDistributedTest.java
index 5a05a920fa..f939064dbc 100644
---
a/modules/table/src/integrationTest/java/org/apache/ignite/internal/rebalance/ItRebalanceDistributedTest.java
+++
b/modules/table/src/integrationTest/java/org/apache/ignite/internal/rebalance/ItRebalanceDistributedTest.java
@@ -220,7 +220,6 @@ import org.apache.ignite.internal.tx.message.TxMessageGroup;
import org.apache.ignite.internal.tx.storage.state.TxStateTableStorage;
import
org.apache.ignite.internal.tx.storage.state.test.TestTxStateTableStorage;
import org.apache.ignite.internal.tx.test.TestLocalRwTxCounter;
-import org.apache.ignite.internal.util.LazyPath;
import org.apache.ignite.internal.vault.VaultManager;
import org.apache.ignite.internal.vault.persistence.PersistentVaultService;
import org.apache.ignite.network.ClusterNode;
@@ -1259,7 +1258,7 @@ public class ItRebalanceDistributedTest extends
BaseIgniteAbstractTest {
dataStorageModules.createStorageEngines(
name,
nodeCfgMgr.configurationRegistry(),
- LazyPath.create(dir.resolve("storage")),
+ dir.resolve("storage"),
null,
failureProcessor,
logSyncer,
@@ -1354,7 +1353,7 @@ public class ItRebalanceDistributedTest extends
BaseIgniteAbstractTest {
replicaSvc,
txManager,
dataStorageMgr,
- LazyPath.create(storagePath),
+ storagePath,
metaStorageManager,
schemaManager,
threadPoolsManager.tableIoExecutor(),
diff --git
a/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/TableManager.java
b/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/TableManager.java
index ec5b1d6c67..613f457ca3 100644
---
a/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/TableManager.java
+++
b/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/TableManager.java
@@ -64,6 +64,7 @@ import static
org.apache.ignite.internal.util.IgniteUtils.shutdownAndAwaitTermin
import static org.apache.ignite.lang.ErrorGroups.Common.INTERNAL_ERR;
import it.unimi.dsi.fastutil.ints.IntOpenHashSet;
+import java.nio.file.Path;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
@@ -214,7 +215,6 @@ import org.apache.ignite.internal.util.ExceptionUtils;
import org.apache.ignite.internal.util.IgniteSpinBusyLock;
import org.apache.ignite.internal.util.IgniteUtils;
import org.apache.ignite.internal.util.Lazy;
-import org.apache.ignite.internal.util.LazyPath;
import org.apache.ignite.internal.util.PendingComparableValuesTracker;
import org.apache.ignite.internal.utils.RebalanceUtilEx;
import org.apache.ignite.internal.worker.ThreadAssertions;
@@ -455,7 +455,7 @@ public class TableManager implements IgniteTablesInternal,
IgniteComponent {
ReplicaService replicaSvc,
TxManager txManager,
DataStorageManager dataStorageMgr,
- LazyPath storagePath,
+ Path storagePath,
MetaStorageManager metaStorageMgr,
SchemaManager schemaManager,
ExecutorService ioExecutor,
@@ -570,7 +570,7 @@ public class TableManager implements IgniteTablesInternal,
IgniteComponent {
startVv = new IncrementalVersionedValue<>(registry);
sharedTxStateStorage = new TxStateRocksDbSharedStorage(
- storagePath.resolveLazy(TX_STATE_DIR),
+ storagePath.resolve(TX_STATE_DIR),
txStateStorageScheduledPool,
txStateStoragePool,
logSyncer,
diff --git
a/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/TableManagerRecoveryTest.java
b/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/TableManagerRecoveryTest.java
index 7016e7d666..76c182514e 100644
---
a/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/TableManagerRecoveryTest.java
+++
b/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/TableManagerRecoveryTest.java
@@ -126,7 +126,6 @@ import
org.apache.ignite.internal.tx.configuration.TransactionConfiguration;
import org.apache.ignite.internal.tx.impl.RemotelyTriggeredResourceRegistry;
import org.apache.ignite.internal.tx.impl.TransactionInflights;
import org.apache.ignite.internal.tx.storage.state.TxStateTableStorage;
-import org.apache.ignite.internal.util.LazyPath;
import org.apache.ignite.internal.util.PendingComparableValuesTracker;
import org.apache.ignite.network.ClusterNode;
import org.apache.ignite.network.NetworkAddress;
@@ -322,9 +321,7 @@ public class TableManagerRecoveryTest extends
IgniteAbstractTest {
indexMetaStorage = new IndexMetaStorage(catalogManager, lowWatermark,
metaStorageManager);
- LazyPath storagePath = LazyPath.create(workDir);
-
- dsm = createDataStorageManager(mock(ConfigurationRegistry.class),
storagePath, storageConfiguration, dataStorageModule, clock);
+ dsm = createDataStorageManager(mock(ConfigurationRegistry.class),
workDir, storageConfiguration, dataStorageModule, clock);
tableManager = new TableManager(
NODE_NAME,
@@ -340,7 +337,7 @@ public class TableManagerRecoveryTest extends
IgniteAbstractTest {
null,
tm,
dsm,
- storagePath,
+ workDir,
metaStorageManager,
sm = new SchemaManager(revisionUpdater, catalogManager),
partitionOperationsExecutor,
@@ -426,7 +423,7 @@ public class TableManagerRecoveryTest extends
IgniteAbstractTest {
private static DataStorageManager createDataStorageManager(
ConfigurationRegistry mockedRegistry,
- LazyPath storagePath,
+ Path storagePath,
StorageConfiguration config,
DataStorageModule dataStorageModule,
HybridClock clock
@@ -489,7 +486,7 @@ public class TableManagerRecoveryTest extends
IgniteAbstractTest {
public StorageEngine createEngine(
String igniteInstanceName,
ConfigurationRegistry configRegistry,
- LazyPath storagePath,
+ Path storagePath,
@Nullable LongJvmPauseDetector longJvmPauseDetector,
FailureProcessor failureProcessor,
LogSyncer logSyncer,
diff --git
a/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/TableManagerTest.java
b/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/TableManagerTest.java
index 6aa866e20a..6b7f2c4114 100644
---
a/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/TableManagerTest.java
+++
b/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/TableManagerTest.java
@@ -58,6 +58,7 @@ import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
+import java.nio.file.Path;
import java.util.Collection;
import java.util.List;
import java.util.Set;
@@ -137,7 +138,6 @@ import
org.apache.ignite.internal.tx.storage.state.TxStateStorage;
import org.apache.ignite.internal.tx.storage.state.TxStateTableStorage;
import org.apache.ignite.internal.util.CursorUtils;
import org.apache.ignite.internal.util.IgniteUtils;
-import org.apache.ignite.internal.util.LazyPath;
import org.apache.ignite.network.ClusterNode;
import org.apache.ignite.network.NetworkAddress;
import org.apache.ignite.sql.IgniteSql;
@@ -801,8 +801,6 @@ public class TableManagerTest extends IgniteAbstractTest {
Consumer<MvTableStorage> tableStorageDecorator,
Consumer<TxStateTableStorage> txStateTableStorageDecorator
) {
- LazyPath storagePath = LazyPath.create(workDir);
-
var tableManager = new TableManager(
NODE_NAME,
revisionUpdater,
@@ -816,8 +814,8 @@ public class TableManagerTest extends IgniteAbstractTest {
null,
null,
tm,
- dsm = createDataStorageManager(configRegistry, storagePath),
- storagePath,
+ dsm = createDataStorageManager(configRegistry, workDir),
+ workDir,
msm,
sm = new SchemaManager(revisionUpdater, catalogManager),
partitionOperationsExecutor,
@@ -873,7 +871,7 @@ public class TableManagerTest extends IgniteAbstractTest {
private DataStorageManager createDataStorageManager(
ConfigurationRegistry mockedRegistry,
- LazyPath storagePath
+ Path storagePath
) {
when(mockedRegistry.getConfiguration(StorageConfiguration.KEY)).thenReturn(storageConfiguration);
diff --git
a/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/gc/PersistentPageMemoryGcUpdateHandlerTest.java
b/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/gc/PersistentPageMemoryGcUpdateHandlerTest.java
index 7373c93738..15073c8915 100644
---
a/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/gc/PersistentPageMemoryGcUpdateHandlerTest.java
+++
b/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/gc/PersistentPageMemoryGcUpdateHandlerTest.java
@@ -37,7 +37,6 @@ import
org.apache.ignite.internal.storage.pagememory.configuration.schema.Persis
import org.apache.ignite.internal.testframework.WorkDirectory;
import org.apache.ignite.internal.testframework.WorkDirectoryExtension;
import org.apache.ignite.internal.util.IgniteUtils;
-import org.apache.ignite.internal.util.LazyPath;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.TestInfo;
@@ -70,7 +69,7 @@ class PersistentPageMemoryGcUpdateHandlerTest extends
AbstractGcUpdateHandlerTes
engineConfig,
storageConfig,
ioRegistry,
- LazyPath.create(workDir),
+ workDir,
new LongJvmPauseDetector(nodeName),
mock(FailureProcessor.class),
mock(LogSyncer.class),
diff --git
a/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/gc/RocksDbGcUpdateHandlerTest.java
b/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/gc/RocksDbGcUpdateHandlerTest.java
index fb7d97ea2e..e56d3daa8d 100644
---
a/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/gc/RocksDbGcUpdateHandlerTest.java
+++
b/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/gc/RocksDbGcUpdateHandlerTest.java
@@ -34,7 +34,6 @@ import
org.apache.ignite.internal.storage.rocksdb.configuration.schema.RocksDbSt
import org.apache.ignite.internal.testframework.WorkDirectory;
import org.apache.ignite.internal.testframework.WorkDirectoryExtension;
import org.apache.ignite.internal.util.IgniteUtils;
-import org.apache.ignite.internal.util.LazyPath;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.TestInfo;
@@ -60,7 +59,7 @@ class RocksDbGcUpdateHandlerTest extends
AbstractGcUpdateHandlerTest {
testNodeName(testInfo, 0),
engineConfig,
storageConfiguration,
- LazyPath.create(workDir),
+ workDir,
mock(LogSyncer.class)
);
diff --git
a/modules/transactions/src/main/java/org/apache/ignite/internal/tx/storage/state/rocksdb/TxStateRocksDbSharedStorage.java
b/modules/transactions/src/main/java/org/apache/ignite/internal/tx/storage/state/rocksdb/TxStateRocksDbSharedStorage.java
index 4056a81782..b956e36a9f 100644
---
a/modules/transactions/src/main/java/org/apache/ignite/internal/tx/storage/state/rocksdb/TxStateRocksDbSharedStorage.java
+++
b/modules/transactions/src/main/java/org/apache/ignite/internal/tx/storage/state/rocksdb/TxStateRocksDbSharedStorage.java
@@ -36,7 +36,6 @@ import org.apache.ignite.internal.components.LogSyncer;
import org.apache.ignite.internal.lang.IgniteInternalException;
import org.apache.ignite.internal.rocksdb.flush.RocksDbFlusher;
import org.apache.ignite.internal.util.IgniteSpinBusyLock;
-import org.apache.ignite.internal.util.LazyPath;
import org.rocksdb.ColumnFamilyDescriptor;
import org.rocksdb.ColumnFamilyHandle;
import org.rocksdb.ColumnFamilyOptions;
@@ -71,7 +70,7 @@ public class TxStateRocksDbSharedStorage implements
ManuallyCloseable {
final ReadOptions readOptions = new ReadOptions();
/** Database path. */
- private final LazyPath dbPath;
+ private final Path dbPath;
/** RocksDB flusher instance. */
private volatile RocksDbFlusher flusher;
@@ -106,7 +105,7 @@ public class TxStateRocksDbSharedStorage implements
ManuallyCloseable {
* @see RocksDbFlusher
*/
public TxStateRocksDbSharedStorage(
- LazyPath dbPath,
+ Path dbPath,
ScheduledExecutorService scheduledExecutor,
ExecutorService threadPool,
LogSyncer logSyncer,
@@ -140,9 +139,7 @@ public class TxStateRocksDbSharedStorage implements
ManuallyCloseable {
*/
public void start() {
try {
- Path path = dbPath.get();
-
- Files.createDirectories(path);
+ Files.createDirectories(dbPath);
flusher = new RocksDbFlusher(
busyLock,
@@ -161,7 +158,7 @@ public class TxStateRocksDbSharedStorage implements
ManuallyCloseable {
List<ColumnFamilyDescriptor> cfDescriptors;
try (Options opts = new Options()) {
- cfDescriptors = RocksDB.listColumnFamilies(opts,
path.toAbsolutePath().toString())
+ cfDescriptors = RocksDB.listColumnFamilies(opts,
dbPath.toAbsolutePath().toString())
.stream()
.map(nameBytes -> new
ColumnFamilyDescriptor(nameBytes, new ColumnFamilyOptions()))
.collect(toList());
diff --git
a/modules/transactions/src/test/java/org/apache/ignite/internal/tx/storage/state/rocksdb/RocksDbTxStateStorageTest.java
b/modules/transactions/src/test/java/org/apache/ignite/internal/tx/storage/state/rocksdb/RocksDbTxStateStorageTest.java
index dcf15dfeee..70f821c93b 100644
---
a/modules/transactions/src/test/java/org/apache/ignite/internal/tx/storage/state/rocksdb/RocksDbTxStateStorageTest.java
+++
b/modules/transactions/src/test/java/org/apache/ignite/internal/tx/storage/state/rocksdb/RocksDbTxStateStorageTest.java
@@ -37,7 +37,6 @@ import org.apache.ignite.internal.tx.TxMeta;
import org.apache.ignite.internal.tx.storage.state.AbstractTxStateStorageTest;
import org.apache.ignite.internal.tx.storage.state.TxStateStorage;
import org.apache.ignite.internal.util.IgniteUtils;
-import org.apache.ignite.internal.util.LazyPath;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -70,7 +69,7 @@ public class RocksDbTxStateStorageTest extends
AbstractTxStateStorageTest {
@BeforeEach
protected void beforeTest() {
sharedStorage =
- new TxStateRocksDbSharedStorage(LazyPath.create(workDir),
scheduledExecutor, executor, mock(LogSyncer.class), () -> 0);
+ new TxStateRocksDbSharedStorage(workDir, scheduledExecutor,
executor, mock(LogSyncer.class), () -> 0);
sharedStorage.start();
super.beforeTest();
