IGNITE-24157 index check fixed

apache · Jan 25, 2025 · 5666b96 · 5666b96
1 parent 5c3a795
commit 5666b96
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/.../java/org/apache/ignite/internal/processors/cache/persistence/DataStorageMetricsImpl.java b/.../java/org/apache/ignite/internal/processors/cache/persistence/DataStorageMetricsImpl.java
@@ -369,11 +369,11 @@ private int walArchiveSegments() {
     /** @return Last archived file absolute index, 0-based. */
     private long lastArchivedSegment() {
         if (!metricsEnabled)
-            return 0;
+            return -1;
 
         IgniteWriteAheadLogManager walMgr = this.wal;
 
-        return walMgr == null ? 0 : walMgr.lastArchivedSegment();
+        return walMgr == null ? -1 : walMgr.lastArchivedSegment();
     }
 
     /**

diff --git a/...apache/ignite/internal/processors/cache/persistence/IgniteDataStorageMetricsSelfTest.java b/...apache/ignite/internal/processors/cache/persistence/IgniteDataStorageMetricsSelfTest.java
@@ -540,12 +540,16 @@ private void checkWalArchiveAndTotalSize(IgniteEx igniteEx, boolean hasWalArchiv
 
         assertEquals(totalSize, dsMetricRegistry(igniteEx).<LongGauge>findMetric("WalTotalSize").value());
 
+        long lastArchivedSegIdx = dsMetricRegistry(igniteEx).<LongGauge>findMetric("LastArchivedSegment").value();
+
         if (router.hasArchive()) {
             long cdcWalArchiveSegments = walFiles(walMgr.walCdcDirectory()).length;
 
             // Count of segments = LastArchivedSegmentIndex + 1
-            assertEquals(cdcWalArchiveSegments, dsMetricRegistry(igniteEx).<LongGauge>findMetric("LastArchivedSegment").value() + 1);
+            assertEquals(cdcWalArchiveSegments, lastArchivedSegIdx + 1);
         }
+        else
+            assertEquals(-1, lastArchivedSegIdx);
     }
 
     /**