aboutsummaryrefslogtreecommitdiffstats
path: root/music-core
diff options
context:
space:
mode:
authorTschaen, Brendan <ctschaen@att.com>2019-10-09 10:39:45 -0400
committerTschaen, Brendan <ctschaen@att.com>2019-10-09 10:39:45 -0400
commitda01a036b92feb080949cd27d6d7273719eb4123 (patch)
treecb64dd2a46c3d5722905976a3c5ee3d44b1d4d59 /music-core
parenta681a9e295dc2b8f35dd42251f795d0079471ac0 (diff)
Include owner in createLockRef
Change-Id: I7403f27b739259576419a380878cf0e263f9b8c6 Issue-ID: MUSIC-502 Signed-off-by: Tschaen, Brendan <ctschaen@att.com>
Diffstat (limited to 'music-core')
-rw-r--r--music-core/src/main/java/org/onap/music/exceptions/MusicDeadlockException.java8
-rw-r--r--music-core/src/main/java/org/onap/music/main/MusicCore.java4
-rw-r--r--music-core/src/main/java/org/onap/music/service/MusicCoreService.java8
-rw-r--r--music-core/src/main/java/org/onap/music/service/impl/MusicCassaCore.java3
4 files changed, 19 insertions, 4 deletions
diff --git a/music-core/src/main/java/org/onap/music/exceptions/MusicDeadlockException.java b/music-core/src/main/java/org/onap/music/exceptions/MusicDeadlockException.java
index f5478e78..7a40ed91 100644
--- a/music-core/src/main/java/org/onap/music/exceptions/MusicDeadlockException.java
+++ b/music-core/src/main/java/org/onap/music/exceptions/MusicDeadlockException.java
@@ -23,10 +23,10 @@ package org.onap.music.exceptions;
public class MusicDeadlockException extends MusicLockingException {
- public String owner = null;
- public String keyspace = null;
- public String table = null;
- public String key = null;
+ private String owner = null;
+ private String keyspace = null;
+ private String table = null;
+ private String key = null;
public MusicDeadlockException() {
super();
diff --git a/music-core/src/main/java/org/onap/music/main/MusicCore.java b/music-core/src/main/java/org/onap/music/main/MusicCore.java
index 658f2124..72421b89 100644
--- a/music-core/src/main/java/org/onap/music/main/MusicCore.java
+++ b/music-core/src/main/java/org/onap/music/main/MusicCore.java
@@ -84,6 +84,10 @@ public class MusicCore {
public static String createLockReference(String fullyQualifiedKey) throws MusicLockingException {
return musicCore.createLockReference(fullyQualifiedKey);
}
+
+ public static String createLockReference(String fullyQualifiedKey, String owner) throws MusicLockingException {
+ return musicCore.createLockReference(fullyQualifiedKey, owner);
+ }
public static String createLockReference(String fullyQualifiedKey, LockType locktype) throws MusicLockingException {
return musicCore.createLockReference(fullyQualifiedKey, locktype);
diff --git a/music-core/src/main/java/org/onap/music/service/MusicCoreService.java b/music-core/src/main/java/org/onap/music/service/MusicCoreService.java
index b3226906..65b98852 100644
--- a/music-core/src/main/java/org/onap/music/service/MusicCoreService.java
+++ b/music-core/src/main/java/org/onap/music/service/MusicCoreService.java
@@ -94,6 +94,13 @@ public interface MusicCoreService {
/**
* Create a lock ref in the music lock store
* @param fullyQualifiedKey the key to create a lock on
+ * @param owner the owner of the lock, for deadlock prevention
+ */
+ public String createLockReference(String fullyQualifiedKey, String owner) throws MusicLockingException;
+
+ /**
+ * Create a lock ref in the music lock store
+ * @param fullyQualifiedKey the key to create a lock on
* @param locktype the type of lock create, see {@link LockType}
*/
public String createLockReference(String fullyQualifiedKey, LockType locktype) throws MusicLockingException;
@@ -178,4 +185,5 @@ public interface MusicCoreService {
public ReturnType deleteFromTable(JsonDelete jsonDeleteObj,MultivaluedMap<String, String> rowParams)
throws MusicLockingException, MusicQueryException, MusicServiceException;
+
}
diff --git a/music-core/src/main/java/org/onap/music/service/impl/MusicCassaCore.java b/music-core/src/main/java/org/onap/music/service/impl/MusicCassaCore.java
index 0d2e3f0a..47fb47b7 100644
--- a/music-core/src/main/java/org/onap/music/service/impl/MusicCassaCore.java
+++ b/music-core/src/main/java/org/onap/music/service/impl/MusicCassaCore.java
@@ -115,6 +115,9 @@ public class MusicCassaCore implements MusicCoreService {
public String createLockReference(String fullyQualifiedKey) throws MusicLockingException {
return createLockReference(fullyQualifiedKey, LockType.WRITE);
}
+ public String createLockReference(String fullyQualifiedKey, String owner) throws MusicLockingException {
+ return createLockReference(fullyQualifiedKey, LockType.WRITE, owner);
+ }
public String createLockReference(String fullyQualifiedKey, LockType locktype) throws MusicLockingException {
return createLockReference(fullyQualifiedKey, locktype, null);