IGNITE-28408 PerfStat: Add Ignite version to prf file name

Author: chesnokoff

modules/core/src/main/java/org/apache/ignite/internal/processors/performancestatistics/FilePerformanceStatisticsReader.java

@@ -91,7 +91,7 @@ public class FilePerformanceStatisticsReader {
         "[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}";
 
     /** File name pattern. */
-    private static final Pattern FILE_NODE_ID_PATTERN = Pattern.compile("^node-(" + UUID_STR_PATTERN + ")[^.]*\\.prf$");
+    private static final Pattern FILE_NODE_ID_PATTERN = Pattern.compile("^node-(" + UUID_STR_PATTERN + ").*\\.prf$");
 
     /** No-op handler. */
     private static final PerformanceStatisticsHandler[] NOOP_HANDLER = {};

modules/core/src/main/java/org/apache/ignite/internal/processors/performancestatistics/FilePerformanceStatisticsWriter.java

@@ -46,6 +46,7 @@
 import static org.apache.ignite.IgniteSystemProperties.IGNITE_PERF_STAT_BUFFER_SIZE;
 import static org.apache.ignite.IgniteSystemProperties.IGNITE_PERF_STAT_FILE_MAX_SIZE;
 import static org.apache.ignite.IgniteSystemProperties.IGNITE_PERF_STAT_FLUSH_SIZE;
+import static org.apache.ignite.internal.IgniteVersionUtils.VER_STR;
 import static org.apache.ignite.internal.processors.performancestatistics.OperationType.CACHE_START;
 import static org.apache.ignite.internal.processors.performancestatistics.OperationType.CHECKPOINT;
 import static org.apache.ignite.internal.processors.performancestatistics.OperationType.JOB;
@@ -92,6 +93,9 @@ public class FilePerformanceStatisticsWriter {
     /** Default maximum cached strings threshold. String caching will stop on threshold excess. */
     public static final int DFLT_CACHED_STRINGS_THRESHOLD = 10 * 1024;
 
+    /** Ignite version marker in performance statistics file names. */
+    private static final String IGNITE_VERSION_FILE_SUFFIX = "-v" + VER_STR;
+
     /**
      * File format version. This version should be incremented each time when format of existing events are
      * changed (fields added/removed) to avoid unexpected non-informative errors on deserialization.
@@ -486,14 +490,16 @@ static File resolveStatisticsFile(GridKernalContext ctx, String fileName) throws
 
         File fileDir = U.resolveWorkDirectory(igniteWorkDir, PERF_STAT_DIR, false);
 
-        File file = new File(fileDir, fileName + ".prf");
+        String statisticsFileName = fileName + IGNITE_VERSION_FILE_SUFFIX;
+
+        File file = new File(fileDir, statisticsFileName + ".prf");
 
         int idx = 0;
 
         while (file.exists()) {
             idx++;
 
-            file = new File(fileDir, fileName + '-' + idx + ".prf");
+            file = new File(fileDir, statisticsFileName + '-' + idx + ".prf");
         }
 
         return file;

modules/core/src/test/java/org/apache/ignite/internal/processors/performancestatistics/AbstractPerformanceStatisticsTest.java

@@ -133,7 +133,7 @@ public static void waitForStatisticsEnabled(boolean performanceStatsEnabled) thr
      */
     public static List<File> systemViewStatisticsFiles(List<File> files) {
         return files.stream()
-            .filter(file1 -> file1.getName().matches("node-.*-system-views(-\\d+)?\\.prf"))
+            .filter(file1 -> file1.getName().matches("node-.*-system-views-v[^-]+(?:-[^-]+)*(-\\d+)?\\.prf"))
             .collect(Collectors.toList());
     }
 

modules/core/src/test/java/org/apache/ignite/internal/processors/performancestatistics/ForwardReadQueryPropertyTest.java

@@ -31,6 +31,7 @@
 
 import static java.util.Collections.singletonList;
 import static java.util.UUID.randomUUID;
+import static org.apache.ignite.internal.IgniteVersionUtils.VER_STR;
 import static org.apache.ignite.internal.processors.performancestatistics.FilePerformanceStatisticsWriter.PERF_STAT_DIR;
 import static org.apache.ignite.internal.processors.performancestatistics.FilePerformanceStatisticsWriter.writeString;
 import static org.apache.ignite.internal.processors.performancestatistics.FilePerformanceStatisticsWriter.writeUuid;
@@ -65,7 +66,7 @@ public void testStringForwardRead() throws Exception {
 
     /** Creates test performance statistics file. */
     private Map<String, String> createStatistics(File dir) throws Exception {
-        File file = new File(dir, "node-" + randomUUID() + ".prf");
+        File file = new File(dir, "node-" + randomUUID() + "-v" + VER_STR + ".prf");
 
         try (FileIO fileIo = new RandomAccessFileIOFactory().create(file)) {
             ByteBuffer buf = ByteBuffer.allocate(1024).order(ByteOrder.nativeOrder());

modules/core/src/test/java/org/apache/ignite/internal/processors/performancestatistics/ForwardReadTest.java

@@ -39,6 +39,7 @@
 import static com.google.common.collect.Lists.cartesianProduct;
 import static java.util.Collections.singletonList;
 import static java.util.UUID.randomUUID;
+import static org.apache.ignite.internal.IgniteVersionUtils.VER_STR;
 import static org.apache.ignite.internal.processors.performancestatistics.FilePerformanceStatisticsWriter.PERF_STAT_DIR;
 import static org.apache.ignite.internal.processors.performancestatistics.FilePerformanceStatisticsWriter.writeIgniteUuid;
 import static org.apache.ignite.internal.processors.performancestatistics.FilePerformanceStatisticsWriter.writeString;
@@ -86,7 +87,7 @@ public void testStringForwardRead() throws Exception {
     private Map<String, Integer> createStatistics(File dir) throws Exception {
         Map<String, Integer> expTasks;
 
-        File file = new File(dir, "node-" + randomUUID() + ".prf");
+        File file = new File(dir, "node-" + randomUUID() + "-v" + VER_STR + ".prf");
 
         try (FileIO fileIo = new RandomAccessFileIOFactory().create(file)) {
             ByteBuffer buf = ByteBuffer.allocate(10 * 1024).order(ByteOrder.nativeOrder());

modules/core/src/test/java/org/apache/ignite/internal/processors/performancestatistics/PerformanceStatisticsMultipleStartTest.java

@@ -25,6 +25,8 @@
 import org.apache.ignite.internal.IgniteEx;
 import org.junit.Test;
 
+import static org.apache.ignite.internal.IgniteVersionUtils.VER_STR;
+
 /**
  * Tests performance statistics multiple start.
  */
@@ -65,6 +67,7 @@ public void testStartCreateNewFile() throws Exception {
 
             assertEquals(i, performanceStatisticsFiles(files).size());
             assertEquals(i, systemViewStatisticsFiles(files).size());
+            assertTrue(files.stream().allMatch(file -> file.getName().contains("-v" + VER_STR)));
         }
     }
 }

modules/core/src/test/java/org/apache/ignite/internal/processors/performancestatistics/PerformanceStatisticsSystemViewTest.java

@@ -41,6 +41,7 @@
 
 import static java.util.UUID.randomUUID;
 import static java.util.function.Function.identity;
+import static org.apache.ignite.internal.IgniteVersionUtils.VER_STR;
 import static org.apache.ignite.internal.processors.cache.persistence.GridCacheDatabaseSharedManager.METASTORE_VIEW;
 import static org.apache.ignite.internal.processors.performancestatistics.FilePerformanceStatisticsWriter.PERF_STAT_DIR;
 import static org.apache.ignite.internal.processors.performancestatistics.FilePerformanceStatisticsWriter.writeString;
@@ -190,7 +191,7 @@ public void testCustomEmptySystemView() throws Exception {
 
     /** Creates test performance statistics file. */
     private List<String> createStatistics(File dir) throws Exception {
-        File file = new File(dir, "node-" + randomUUID() + ".prf");
+        File file = new File(dir, "node-" + randomUUID() + "-v" + VER_STR + ".prf");
 
         try (FileIO fileIo = new RandomAccessFileIOFactory().create(file)) {
             ByteBuffer buf = ByteBuffer.allocate(1024).order(ByteOrder.nativeOrder());