IGNITE-28432 Add storage name to segstore (#7953)

Author: sashapolo

modules/raft/src/main/java/org/apache/ignite/internal/raft/storage/segstore/RaftLogCheckpointer.java

@@ -66,6 +66,7 @@ class RaftLogCheckpointer {
 
     RaftLogCheckpointer(
             String nodeName,
+            String storageName,
             IndexFileManager indexFileManager,
             FailureProcessor failureProcessor,
             int maxQueueSize,
@@ -76,7 +77,7 @@ class RaftLogCheckpointer {
         this.beforeIndexFileCreated = beforeIndexFileCreated;
 
         queue = new CheckpointQueue(maxQueueSize);
-        checkpointThread = new IgniteThread(nodeName, "segstore-checkpoint", new CheckpointTask());
+        checkpointThread = new IgniteThread(nodeName, "segstore-checkpoint-" + storageName, new CheckpointTask());
     }
 
     void start() {

modules/raft/src/main/java/org/apache/ignite/internal/raft/storage/segstore/RaftLogGarbageCollector.java

@@ -98,6 +98,7 @@ class RaftLogGarbageCollector {
 
     RaftLogGarbageCollector(
             String nodeName,
+            String storageName,
             Path segmentFilesDir,
             IndexFileManager indexFileManager,
             long softLimitBytes,
@@ -110,7 +111,7 @@ class RaftLogGarbageCollector {
         this.strategy = strategy;
         this.failureProcessor = failureProcessor;
 
-        gcThread = new IgniteThread(nodeName, "segstore-gc", new GcTask());
+        gcThread = new IgniteThread(nodeName, "segstore-gc-" + storageName, new GcTask());
     }
 
     void start() throws IOException {

modules/raft/src/main/java/org/apache/ignite/internal/raft/storage/segstore/SegmentFileManager.java

@@ -115,6 +115,8 @@ class SegmentFileManager implements ManuallyCloseable {
      */
     static final byte[] SWITCH_SEGMENT_RECORD = new byte[8]; // 8 zero bytes.
 
+    private final String storageName;
+
     private final Path segmentFilesDir;
 
     /** Number of stripes used by the index memtable. Should be equal to the number of stripes in the Raft server's Disruptor. */
@@ -156,13 +158,18 @@ class SegmentFileManager implements ManuallyCloseable {
 
     SegmentFileManager(
             String nodeName,
+            String storageName,
             Path baseDir,
             int stripes,
             FailureProcessor failureProcessor,
             RaftConfiguration raftConfiguration,
             LogStorageConfiguration storageConfiguration
     ) throws IOException {
-        this.segmentFilesDir = baseDir.resolve("segments");
+        this.storageName = storageName;
+
+        Path storageDir = baseDir.resolve(storageName);
+
+        this.segmentFilesDir = storageDir.resolve("segments");
         this.stripes = stripes;
         this.isSync = raftConfiguration.fsync().value();
 
@@ -174,10 +181,11 @@ class SegmentFileManager implements ManuallyCloseable {
 
         maxLogEntrySize = maxLogEntrySize(logStorageView);
 
-        indexFileManager = new IndexFileManager(baseDir);
+        indexFileManager = new IndexFileManager(storageDir);
 
         garbageCollector = new RaftLogGarbageCollector(
                 nodeName,
+                storageName,
                 segmentFilesDir,
                 indexFileManager,
                 logStorageView.softLogSizeLimitBytes(),
@@ -187,6 +195,7 @@ class SegmentFileManager implements ManuallyCloseable {
 
         checkpointer = new RaftLogCheckpointer(
                 nodeName,
+                storageName,
                 indexFileManager,
                 failureProcessor,
                 logStorageView.maxCheckpointQueueSize(),
@@ -195,7 +204,10 @@ class SegmentFileManager implements ManuallyCloseable {
     }
 
     void start() throws IOException {
-        LOG.info("Starting segment file manager [segmentFilesDir={}, fileSize={}].", segmentFilesDir, segmentFileSize);
+        LOG.info(
+                "Starting segment file manager [storageName={}, segmentFilesDir={}, fileSize={}].",
+                storageName, segmentFilesDir, segmentFileSize
+        );
 
         indexFileManager.cleanupLeftoverFiles();
         garbageCollector.cleanupLeftoverFiles();

modules/raft/src/test/java/org/apache/ignite/internal/raft/storage/segstore/RaftLogCheckpointerTest.java

@@ -60,7 +60,14 @@ class RaftLogCheckpointerTest extends BaseIgniteAbstractTest {
 
     @BeforeEach
     void setUp() {
-        checkpointer = new RaftLogCheckpointer(NODE_NAME, indexFileManager, new NoOpFailureManager(), MAX_QUEUE_SIZE, size -> {});
+        checkpointer = new RaftLogCheckpointer(
+                NODE_NAME,
+                NODE_NAME,
+                indexFileManager,
+                new NoOpFailureManager(),
+                MAX_QUEUE_SIZE,
+                size -> {}
+        );
 
         checkpointer.start();
     }

modules/raft/src/test/java/org/apache/ignite/internal/raft/storage/segstore/RaftLogGarbageCollectorTest.java

@@ -89,6 +89,7 @@ class RaftLogGarbageCollectorTest extends IgniteAbstractTest {
     @BeforeEach
     void setUp() throws IOException {
         fileManager = new SegmentFileManager(
+                NODE_NAME,
                 NODE_NAME,
                 workDir,
                 STRIPES,
@@ -411,6 +412,7 @@ void testCleanupLeftoverFilesOnRecovery() throws Exception {
         fileManager.close();
 
         fileManager = new SegmentFileManager(
+                NODE_NAME,
                 NODE_NAME,
                 workDir,
                 STRIPES,
@@ -736,6 +738,7 @@ private void restartSegmentFileManager() throws Exception {
         fileManager.close();
 
         fileManager = new SegmentFileManager(
+                NODE_NAME,
                 NODE_NAME,
                 workDir,
                 STRIPES,

modules/raft/src/test/java/org/apache/ignite/internal/raft/storage/segstore/RaftLogGcSoftLimitTest.java

@@ -86,6 +86,7 @@ class RaftLogGcSoftLimitTest extends IgniteAbstractTest {
     @BeforeEach
     void setUp() throws IOException {
         fileManager = new SegmentFileManager(
+                NODE_NAME,
                 NODE_NAME,
                 workDir,
                 STRIPES,

modules/raft/src/test/java/org/apache/ignite/internal/raft/storage/segstore/SegmentFileManagerGetEntryTest.java

@@ -83,6 +83,7 @@ void setUp(
             LogStorageConfiguration storageConfiguration
     ) throws IOException {
         fileManager = new SegmentFileManager(
+                NODE_NAME,
                 NODE_NAME,
                 workDir,
                 STRIPES,

modules/raft/src/test/java/org/apache/ignite/internal/raft/storage/segstore/SegmentFileManagerTest.java

@@ -115,6 +115,7 @@ void setUp() throws IOException {
 
     private SegmentFileManager createFileManager() throws IOException {
         return new SegmentFileManager(
+                NODE_NAME,
                 NODE_NAME,
                 workDir,
                 STRIPES,

modules/raft/src/test/java/org/apache/ignite/internal/raft/storage/segstore/SegstoreLogStorageConcurrencyTest.java

@@ -57,6 +57,7 @@ void setUp(
             LogStorageConfiguration storageConfiguration
     ) throws IOException {
         segmentFileManager = new SegmentFileManager(
+                NODE_NAME,
                 NODE_NAME,
                 workDir,
                 1,

modules/raft/src/test/java/org/apache/ignite/internal/raft/storage/segstore/SegstoreLogStorageTest.java

@@ -60,6 +60,7 @@ void tearDown() throws Exception {
     protected LogStorage newLogStorage() {
         try {
             segmentFileManager = new SegmentFileManager(
+                    NODE_NAME,
                     NODE_NAME,
                     path,
                     1,