[ISSUE #10373] Quarantine flaky PopPriorityIT and fix test cases

- Quarantine PopPriorityIT at class level (multiple methods fail
  intermittently with 'expected:<8> but was:<2>' due to async race)
- Fix ConsumerOrderInfoManagerLockFreeNotifyTest
- Fix IndexStoreServiceTest

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Author: lizhimins

broker/src/test/java/org/apache/rocketmq/broker/pop/orderly/ConsumerOrderInfoManagerLockFreeNotifyTest.java

@@ -35,7 +35,6 @@
 import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
-import org.junit.Ignore;
 
 public class ConsumerOrderInfoManagerLockFreeNotifyTest {
 
@@ -157,17 +156,17 @@ public void testConsumeTheChangeInvisibleShorter() {
         assertTrue(consumerOrderInfoManager.getConsumerOrderInfoLockManager().getTimeoutMap().isEmpty());
     }
 
-    @Ignore("Flaky: fails 2/100 runs (2.0%)")
     @Test
     public void testRecover() {
+        long recoverPopTime = System.currentTimeMillis();
         QueueLevelConsumerManager savedConsumerOrderInfoManager = new QueueLevelConsumerManager();
         savedConsumerOrderInfoManager.update(
             null,
             false,
             TOPIC,
             GROUP,
             QUEUE_ID_0,
-            popTime,
+            recoverPopTime,
             3000,
             Lists.newArrayList(1L),
             new StringBuilder()

test/src/test/java/org/apache/rocketmq/test/client/consumer/pop/PopPriorityIT.java

@@ -31,6 +31,7 @@
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
@@ -48,6 +49,7 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
+@Ignore("Flaky: multiple methods fail intermittently in CI with 'expected:<8> but was:<2>' due to async race in pop priority consume")
 @RunWith(Parameterized.class)
 public class PopPriorityIT extends BasePopNormally {
 

tieredstore/src/test/java/org/apache/rocketmq/tieredstore/index/IndexStoreServiceTest.java

@@ -53,7 +53,6 @@
 import org.slf4j.LoggerFactory;
 
 import static org.awaitility.Awaitility.await;
-import org.junit.Ignore;
 
 public class IndexStoreServiceTest {
 
@@ -309,12 +308,14 @@ public void queryFromFileTest() throws InterruptedException, ExecutionException
         }
     }
 
-    @Ignore("Flaky: fails 1/65 runs (1.5%)")
     @Test
     public void concurrentGetTest() throws InterruptedException {
         storeConfig.setTieredStoreIndexFileMaxIndexNum(2000);
         indexService = new IndexStoreService(fileAllocator, filePath);
         indexService.start();
+        // Wait for service thread to complete its first iteration and enter 10s wait,
+        // preventing compaction from racing with queries below.
+        TimeUnit.MILLISECONDS.sleep(500);
 
         int fileCount = 10;
         for (int j = 0; j < fileCount; j++) {
@@ -354,41 +355,37 @@ public void concurrentGetTest() throws InterruptedException {
         Assert.assertTrue(result.get());
     }
 
-    @Ignore("Flaky: fails 35/100 runs (35.0%)")
     @Test
     public void queryCrossFileBoundaryTest() throws InterruptedException, ExecutionException {
         indexService = new IndexStoreService(fileAllocator, filePath);
         indexService.start();
 
-        // Create first file with early beginTime
-        long file1Begin = System.currentTimeMillis();
-        for (int i = 0; i < storeConfig.getTieredStoreIndexFileMaxIndexNum() - 1; i++) {
+        long file1Begin = indexService.getTimeStoreTable().firstKey();
+
+        // Fill file1 completely to trigger SEALED and create file2.
+        // maxIndexNum=20, seals when indexItemCount + 1 >= 20, so 20 puts will seal and overflow.
+        for (int i = 0; i < storeConfig.getTieredStoreIndexFileMaxIndexNum(); i++) {
             indexService.putKey(TOPIC_NAME, TOPIC_ID, QUEUE_ID,
                 Collections.singleton("crossKey"), i * 100L, MESSAGE_SIZE, file1Begin + i * 1000);
         }
 
-        // Create second file with later beginTime (beyond query range)
-        long file2Begin = System.currentTimeMillis() + 100_000;
-        indexService.createNewIndexFile(file2Begin);
+        // One more put to go into file2
+        long file2ItemTimestamp = file1Begin + 100_000;
         for (int i = 0; i < 5; i++) {
             indexService.putKey(TOPIC_NAME, TOPIC_ID, QUEUE_ID,
-                Collections.singleton("crossKey"), i * 100L, MESSAGE_SIZE, file2Begin + i);
+                Collections.singleton("crossKey"), (20 + i) * 100L, MESSAGE_SIZE, file2ItemTimestamp + i);
         }
 
         Assert.assertEquals(2, indexService.getTimeStoreTable().size());
 
-        // Query range: beginTime is AFTER file1's beginTime but BEFORE file1's last item timestamp
-        // This should select file1, NOT file2 (file2 beginTime > queryEnd)
+        // Query range starts AFTER file1's beginTimestamp but covers file1's items.
+        // This verifies headMap(endTime) correctly includes file1 even though file1.key < queryBegin.
         long queryBegin = file1Begin + 5_000;
         long queryEnd = file1Begin + 15_000;
 
         List<IndexItem> results = indexService.queryAsync(
-            TOPIC_NAME, "crossKey", 10, queryBegin, queryEnd).get();
+            TOPIC_NAME, "crossKey", 50, queryBegin, queryEnd).get();
 
-        // file1 has items at timestamps: file1Begin, file1Begin+1000, ..., file1Begin+(N-1)*1000
-        // Items in range [file1Begin+5000, file1Begin+15000] should match
-        // The bug (subMap) would return empty because file1's key < queryBegin
         Assert.assertFalse("Should find index items from file covering query range", results.isEmpty());
-        Assert.assertTrue("Should find items within query time range", results.size() > 0);
     }
 }