Skip to content
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

Improve message when lock is held by some other client #110

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Improve message when lock is held by some other client #110

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 3 additions & 2 deletions src/main/java/uk/sky/cqlmigrate/CassandraLockingMechanism.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,12 +72,13 @@ public boolean acquire(String clientId) throws CannotAcquireLockException {
verifyClusterIsHealthy();
ResultSet resultSet = session.execute(insertLockQuery.bind(lockName, clientId));
Row currentLock = resultSet.one();
String currentClientWithLock = currentLock.getString("client");
// we could already hold the lock and not be aware if a previous acquire had a writetimeout as a timeout is not a failure in cassandra
// also since we use a conditional insertion (IF NOT EXISTS) the resultSet is never null, same with resultSet.one()
if (currentLock.getBoolean("[applied]") || clientId.equals(currentLock.getString("client"))) {
if (currentLock.getBoolean("[applied]") || clientId.equals(currentClientWithLock)) {
return true;
} else {
log.info("Lock currently held by {}", currentLock);
log.info("Lock currently held by client {}", currentClientWithLock);
return false;
}
} catch (WriteTimeoutException wte) {
Expand Down