[kafka] branch 3.6 updated: MINOR: Fix the TBRLMMRestart test. (#14297)

[satishd]

This is an automated email from the ASF dual-hosted git repository.

satishd pushed a commit to branch 3.6
in repository https://gitbox.apache.org/repos/asf/kafka.git


The following commit(s) were added to refs/heads/3.6 by this push:
     new de7ee8a2ded MINOR: Fix the TBRLMMRestart test. (#14297)
de7ee8a2ded is described below

commit de7ee8a2ded765673d6511549a051da97ec0d106
Author: Kamal Chandraprakash <kchandraprak...@uber.com>
AuthorDate: Mon Aug 28 20:23:17 2023 +0530

    MINOR: Fix the TBRLMMRestart test. (#14297)
    
    Reviewers: Luke Chen <show...@gmail.com>, Satish Duggana 
<sati...@apache.org>
---
 .../TopicBasedRemoteLogMetadataManagerRestartTest.java  | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git 
a/storage/src/test/java/org/apache/kafka/server/log/remote/metadata/storage/TopicBasedRemoteLogMetadataManagerRestartTest.java
 
b/storage/src/test/java/org/apache/kafka/server/log/remote/metadata/storage/TopicBasedRemoteLogMetadataManagerRestartTest.java
index 46ffeba2142..462ebe7bffe 100644
--- 
a/storage/src/test/java/org/apache/kafka/server/log/remote/metadata/storage/TopicBasedRemoteLogMetadataManagerRestartTest.java
+++ 
b/storage/src/test/java/org/apache/kafka/server/log/remote/metadata/storage/TopicBasedRemoteLogMetadataManagerRestartTest.java
@@ -136,14 +136,18 @@ public class 
TopicBasedRemoteLogMetadataManagerRestartTest {
         startTopicBasedRemoteLogMetadataManagerHarness(true);
 
         // Register these partitions to RLMM, which loads the respective 
metadata snapshots.
-        
topicBasedRlmm().onPartitionLeadershipChanges(Collections.singleton(leaderTopicIdPartition),
 Collections.singleton(followerTopicIdPartition));
+        topicBasedRlmm().onPartitionLeadershipChanges(
+                Collections.singleton(leaderTopicIdPartition), 
Collections.singleton(followerTopicIdPartition));
 
         // Check for the stored entries from the earlier run.
-        
Assertions.assertTrue(TestUtils.sameElementsWithoutOrder(Collections.singleton(leaderSegmentMetadata).iterator(),
-                                                                 
topicBasedRlmm().listRemoteLogSegments(leaderTopicIdPartition)));
-        
Assertions.assertTrue(TestUtils.sameElementsWithoutOrder(Collections.singleton(followerSegmentMetadata).iterator(),
-                                                                 
topicBasedRlmm().listRemoteLogSegments(followerTopicIdPartition)));
-
+        TestUtils.waitForCondition(() ->
+            
TestUtils.sameElementsWithoutOrder(Collections.singleton(leaderSegmentMetadata).iterator(),
+                    
topicBasedRlmm().listRemoteLogSegments(leaderTopicIdPartition)),
+                "Remote log segment metadata not available");
+        TestUtils.waitForCondition(() ->
+            
TestUtils.sameElementsWithoutOrder(Collections.singleton(followerSegmentMetadata).iterator(),
+                    
topicBasedRlmm().listRemoteLogSegments(followerTopicIdPartition)),
+                "Remote log segment metadata not available");
         // Add one more segment
         RemoteLogSegmentMetadata leaderSegmentMetadata2 = new 
RemoteLogSegmentMetadata(
                 new RemoteLogSegmentId(leaderTopicIdPartition, 
Uuid.randomUuid()),
@@ -155,5 +159,4 @@ public class TopicBasedRemoteLogMetadataManagerRestartTest {
         
Assertions.assertTrue(TestUtils.sameElementsWithoutOrder(Arrays.asList(leaderSegmentMetadata,
 leaderSegmentMetadata2).iterator(),
                                                                  
topicBasedRlmm().listRemoteLogSegments(leaderTopicIdPartition)));
     }
-
 }
\ No newline at end of file