diff options
Diffstat (limited to 'music-core/src/main/java/org/onap/music/lockingservice')
3 files changed, 13 insertions, 9 deletions
diff --git a/music-core/src/main/java/org/onap/music/lockingservice/cassandra/CassaLockStore.java b/music-core/src/main/java/org/onap/music/lockingservice/cassandra/CassaLockStore.java index 0c5d39c8..9a69a9ba 100644 --- a/music-core/src/main/java/org/onap/music/lockingservice/cassandra/CassaLockStore.java +++ b/music-core/src/main/java/org/onap/music/lockingservice/cassandra/CassaLockStore.java @@ -503,7 +503,7 @@ public class CassaLockStore { } public List<String> getAllLocksForOwner(String ownerId, String keyspace, String table) throws MusicServiceException, MusicQueryException { - List<String> toRet = new ArrayList<String>(); + List<String> toRet = new ArrayList<>(); String lockTable = table_prepend_name + table; PreparedQueryObject queryObject = new PreparedQueryObject(); queryObject.appendQueryString("SELECT key, lockreference FROM " + keyspace + "." + lockTable); diff --git a/music-core/src/main/java/org/onap/music/lockingservice/cassandra/LockCleanUpDaemon.java b/music-core/src/main/java/org/onap/music/lockingservice/cassandra/LockCleanUpDaemon.java index 492a48f0..623a07c7 100644 --- a/music-core/src/main/java/org/onap/music/lockingservice/cassandra/LockCleanUpDaemon.java +++ b/music-core/src/main/java/org/onap/music/lockingservice/cassandra/LockCleanUpDaemon.java @@ -23,12 +23,10 @@ package org.onap.music.lockingservice.cassandra; import java.util.HashSet; -import java.util.List; import java.util.Set; import org.onap.music.datastore.MusicDataStoreHandle; import org.onap.music.datastore.PreparedQueryObject; import org.onap.music.eelf.logging.EELFLoggerDelegate; -import org.onap.music.exceptions.MusicQueryException; import org.onap.music.exceptions.MusicServiceException; import org.onap.music.main.MusicCore; import org.onap.music.main.MusicUtil; @@ -58,7 +56,8 @@ public class LockCleanUpDaemon extends Thread { try { Thread.sleep(MusicUtil.getLockDaemonSleepTimeMs()); } catch (InterruptedException e) { - e.printStackTrace(); + logger.warn(EELFLoggerDelegate.applicationLogger, "Interrupted exception", e); + } } } @@ -110,12 +109,14 @@ public class LockCleanUpDaemon extends Thread { private void deleteLockIfStale(String lockTable, Row lock) throws MusicServiceException { - if (lock.isNull("createtime") && lock.isNull("acquiretime")) { + final String CREATETIME="createtime"; + final String ACQUIRETIME="acquiretime"; + if (lock.isNull(CREATETIME) && lock.isNull("acquiretime")) { return; } - long createTime = lock.isNull("createtime") ? 0 : Long.parseLong(lock.getString("createtime")); - long acquireTime = lock.isNull("acquiretime") ? 0 : Long.parseLong(lock.getString("acquiretime")); + long createTime = lock.isNull(CREATETIME) ? 0 : Long.parseLong(lock.getString(CREATETIME)); + long acquireTime = lock.isNull(ACQUIRETIME) ? 0 : Long.parseLong(lock.getString(ACQUIRETIME)); long row_access_time = Math.max(createTime, acquireTime); if (System.currentTimeMillis() > row_access_time + MusicUtil.getDefaultLockLeasePeriod()) { logger.info(EELFLoggerDelegate.applicationLogger, "Stale lock detected and being removed: " + lock); diff --git a/music-core/src/main/java/org/onap/music/lockingservice/cassandra/MusicLockState.java b/music-core/src/main/java/org/onap/music/lockingservice/cassandra/MusicLockState.java index 00187dc8..14fb8135 100644 --- a/music-core/src/main/java/org/onap/music/lockingservice/cassandra/MusicLockState.java +++ b/music-core/src/main/java/org/onap/music/lockingservice/cassandra/MusicLockState.java @@ -39,15 +39,18 @@ import org.onap.music.eelf.logging.format.ErrorTypes; // the state variable that will be stored in the locking service, capturing the transitions of public class MusicLockState implements Serializable { + // captures the state of the lock public enum LockStatus { UNLOCKED, BEING_LOCKED, LOCKED - };// captures the state of the lock + } + private static EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(MusicLockState.class); private LockStatus lockStatus; private boolean needToSyncQuorum = false; private String lockHolder; - private long leasePeriod = Long.MAX_VALUE, leaseStartTime = -1; + private long leasePeriod = Long.MAX_VALUE; + private long leaseStartTime = -1; private String errorMessage = null; public MusicLockState(String errorMessage) { |