Skip to content

Fixed ResourceLockTest.revalidateLockOnDifferentSession() #11885

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lhotari merged 3 commits into from
Sep 1, 2021
Merged

Fixed ResourceLockTest.revalidateLockOnDifferentSession() #11885

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
655df55
Fixed ResourceLockTest.revalidateLockOnDifferentSession()
merlimat Sep 1, 2021
8b68010
Merge branch 'master' into fix-resource-lock-test
merlimat Sep 1, 2021
12e0775
Fixed merge conflict
merlimat Sep 1, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions pulsar-metadata/src/test/java/org/apache/pulsar/metadata/LockManagerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
import java.util.concurrent.TimeUnit;
import java.util.function.Supplier;
import lombok.Cleanup;
import org.apache.pulsar.common.util.ObjectMapperFactory;
import org.apache.pulsar.metadata.api.MetadataCache;
import org.apache.pulsar.metadata.api.MetadataStoreConfig;
import org.apache.pulsar.metadata.api.MetadataStoreException.LockBusyException;
Expand All @@ -40,6 +41,7 @@
import org.apache.pulsar.metadata.api.extended.CreateOption;
import org.apache.pulsar.metadata.api.extended.MetadataStoreExtended;
import org.apache.pulsar.metadata.coordination.impl.CoordinationServiceImpl;
import org.awaitility.Awaitility;
import org.testng.annotations.Test;

public class LockManagerTest extends BaseMetadataStoreTest {
Expand Down Expand Up @@ -213,20 +215,23 @@ public void revalidateLockOnDifferentSession(String provider, Supplier<String> u
assertEquals(e.getCause().getClass(), LockBusyException.class);
}

// Lock-1 should get notification of expiry
// Lock-1 should not get invalidated
assertFalse(rl1.getLockExpiredFuture().isDone());

assertEquals(new String(store1.get(path1).join().get().getValue()), "\"value-1\"");

// Simulate existing lock with same content. The 2nd acquirer will steal the lock
String path2 = newKey();
rl1 = lm1.acquireLock(path2, "value-1").join();
store1.put(path2, ObjectMapperFactory.getThreadLocal().writeValueAsBytes("value-1"), Optional.of(-1L));

ResourceLock<String> rl2 = lm2.acquireLock(path2, "value-1").join();

assertFalse(rl1.getLockExpiredFuture().isDone());
assertFalse(rl2.getLockExpiredFuture().isDone());

assertEquals(new String(store1.get(path2).join().get().getValue()), "\"value-1\"");
Awaitility.await().untilAsserted(() -> {
// On 'store1' we might see for a short amount of time an empty result still cached while the lock is
// being reacquired.
assertEquals(new String(store1.get(path2).join().get().getValue()), "\"value-1\"");
});
}
}