[fix][test] Fix flaky test LeaderElectionTest.revalidateLeaderWithinS…

…ameSession (#22383) (cherry picked from commit 216b830)
apache · Sep 23, 2024 · e63dcd4 · e63dcd4
1 parent a17a262
commit e63dcd4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/api/MetadataCache.java b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/api/MetadataCache.java
@@ -57,7 +57,7 @@ public interface MetadataCache<T> {
      *
      * @param path
      *            the path of the object in the metadata store
-     * @return the cached object or an empty {@link Optional} is the cache doesn't have the object
+     * @return the cached object or an empty {@link Optional} is the cache does not have the object
      */
     Optional<T> getIfCached(String path);
 

diff --git a/pulsar-metadata/src/test/java/org/apache/pulsar/metadata/BaseMetadataStoreTest.java b/pulsar-metadata/src/test/java/org/apache/pulsar/metadata/BaseMetadataStoreTest.java
@@ -119,10 +119,11 @@ public static void assertEqualsAndRetry(Supplier<Object> actual,
                                             int retryCount,
                                             long intSleepTimeInMillis) throws Exception {
         assertTrue(retryStrategically((__) -> {
-            if (actual.get().equals(expectedAndRetry)) {
+            Object actualObject = actual.get();
+            if (actualObject.equals(expectedAndRetry)) {
                 return false;
             }
-            assertEquals(actual.get(), expected);
+            assertEquals(actualObject, expected);
             return true;
         }, retryCount, intSleepTimeInMillis));
     }