-# Docker Setup
----------------
-```bash
-# Start the Container
-docker run -d --name cassandra_music -v $PWD/data:/var/lib/cassandra cassandra_music:3.0
-# Load cql script into DB
-docker run -it --link cassandra1:cassandra -v $PWD/music.cql:/music.cql cassandra_music1:3.0 cqlsh -u cassandra -p cassandra cassandra1 -f music.cql
-# Start cqlsh
-docker run -it --link cassandra_music:cassandra cassandra_music:3.0 cqlsh -u cassandra -p cassandra cassandra1
-
-```
### Docker Setup for Single instance of MUSIC
<p>Please update the <b>properties/music.properties</b> file to fit your env.<br/>
-Update the start.sh file.<br/>
-The beginning of the <b>start.sh</b> file contains various variables.<br/></p>
+Update the music.sh file.<br/>
+The beginning of the <b>music.sh</b> file contains various variables.<br/></p>
CASS_IMG - Cassandra Image<br/>
TOMCAT_IMG - Tomcat Image<br/>
MUSIC Logs will be saved in logs/MUSIC after start of tomcat.<br/>
+```bash
+# Start containers
+./music.sh start
+# Stop containers
+./music.sh stop
+```
+
+If you want to check out Cassandra db with cqlsh.
+```bash
+docker exec –it music-db bash
+#at the prompt youcan run cqlsh as:
+cqlsh –u <user> -p <password>
+```
+
+Zookeeper:
+
+```bash
+docker exec –it music-zk bash
+#and then run:
+zkCli.sh
+```
+
+For other logs do <br/>
+```bash
+docker logs music-tomcat (tomcat)<br/>
+```
+to have rolling logs use –f as docker logs –f music-tomcat<br/>
+```bash
+docker logs music-zk (zookeeper)<br/>
+docker logs music-db (Cassandra )<br/>
+```
\ No newline at end of file
#debug=true
#music.rest.ip=localhost
#lock.lease.period=6000
-cassandra.user=xxuserxxx
-cassandra.password=xxpasswordxx
+cassandra.user=cassandra1
+cassandra.password=cassandra1
# AAF Endpoint if using AAF
-#aaf.endpoint.url=
+aaf.endpoint.url=https://aaf.api.simpledemo.onap.org
+++ /dev/null
-#
-# -------------------------------------------------------------------------
-# Copyright (c) 2017 AT&T Intellectual Property
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# -------------------------------------------------------------------------
-# In this example we are building a docker bridge network(music-net) for all
-# the containers
-# Then we connect the host bridge network(bridge) to the internal network(music-net)
-#
-#
-#
-CASS_IMG=nexus3.onap.org:10001/onap/music/cassandra_music:latest
-TOMCAT_IMG=nexus3.onap.org:10001/library/tomcat:8.0
-ZK_IMG=nexus3.onap.org:10001/library/zookeeper:3.4
-MUSIC_IMG=nexus3.onap.org:10001/onap/music/music:latest
-WORK_DIR=${PWD}
-CASS_USERNAME=cassandra1
-CASS_PASSWORD=cassandra1
-
-if [ "$1" = "start" ]; then
-
-# Create Volume for mapping war file and tomcat
-docker volume create music-vol;
-
-# Create a network for all the containers to run in.
-docker network create music-net;
-
-# Start Cassandra
-docker run -d --rm --name music-db --network music-net \
--p "7000:7000" -p "7001:7001" -p "7199:7199" -p "9042:9042" -p "9160:9160" \
--e CASSUSER=${CASS_USERNAME} \
--e CASSPASS=${CASS_PASSWORD} \
-${CASS_IMG};
-
-# Start Music war
-docker run -d --rm --name music-war \
--v music-vol:/app \
-${MUSIC_IMG};
-
-# Start Zookeeper
-docker run -d --rm --name music-zk --network music-net
--p "2181:2181" -p "2888:2888" -p "3888:3888" \
-${ZK_IMG};
-
-# Delay for Cassandra
-sleep 20;
-
-# Start Up tomcat - Needs to have properties,logs dir and war file volume mapped.
-docker run -d --rm --name music-tomcat --network music-net -p "8080:8080" \
--v music-vol:/usr/local/tomcat/webapps \
--v ${WORK_DIR}/properties:/opt/app/music/etc:ro \
--v ${WORK_DIR}/logs:/opt/app/music/logs \
-${TOMCAT_IMG};
-
-# Connect tomcat to host bridge network so that its port can be seen.
-docker network connect bridge music-tomcat;
-
-fi
-
-
-# Shutdown and clean up.
-if [ "$1" = "stop" ]; then
-docker stop music-war;
-docker stop music-db;
-docker stop music-zk;
-docker stop music-tomcat;
-docker network rm music-net;
-sleep 5;
-docker volume rm music-vol;
-fi
<sitePath>/content/sites/site/org/onap/music/${project.version}</sitePath>
<!--maven -->
<timestamp>${maven.build.timestamp}</timestamp>
- <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
+ <maven.build.timestamp.format>yyyy.MM.dd.HH.mm</maven.build.timestamp.format>
<!--docker -->
<docker.tag>${project.version}-${timestamp}</docker.tag>
<docker.latest.tag>${project.version}-latest</docker.latest.tag>
zkLockHandle.unlock(lockId);
}
- public void deleteLock(String lockName) {
- zkLockHandle.deleteLock(lockName);
+ public void deleteLock(String lockName) throws MusicLockingException {
+ if(lockIdExists(lockName))
+ zkLockHandle.deleteLock(lockName);
+ else{
+ throw new MusicLockingException("Lock does not exist.Please check the lock: " + lockName + " and try again");
+ }
}
public String whoseTurnIsIt(String lockName) {
/**
*
* @param lockName
+ * @throws MusicLockingException
*/
- public static void deleteLock(String lockName) {
+ public static void deleteLock(String lockName) throws MusicLockingException {
long start = System.currentTimeMillis();
logger.info(EELFLoggerDelegate.applicationLogger,"Deleting lock for " + lockName);
try {
getLockingServiceHandle().deleteLock("/" + lockName);
} catch (MusicLockingException e) {
logger.error(EELFLoggerDelegate.errorLogger,e.getMessage(), AppMessages.DELTELOCK+lockName ,ErrorSeverity.CRITICAL, ErrorTypes.LOCKINGERROR);
+ throw new MusicLockingException(e.getMessage());
}
long end = System.currentTimeMillis();
logger.info(EELFLoggerDelegate.applicationLogger,"Time taken to delete lock:" + (end - start) + " ms");
logger.error(EELFLoggerDelegate.errorLogger,"", AppMessages.UNKNOWNERROR ,ErrorSeverity.CRITICAL, ErrorTypes.GENERALSERVICEERROR);
return response.status(Status.BAD_REQUEST).entity(resultMap).build();
}
- MusicCore.deleteLock(lockName);
+ try{
+ MusicCore.deleteLock(lockName);
+ }catch (Exception e) {
+ return response.status(Status.BAD_REQUEST).entity(new JsonResponse(ResultType.FAILURE).setError(e.getMessage()).toMap()).build();
+ }
return response.status(Status.OK).entity(new JsonResponse(ResultType.SUCCESS).toMap()).build();
}
}
@Test
- public void testDeleteLock() {
+ public void testDeleteLock() throws MusicLockingException {
Mockito.doNothing().when(mLockHandle).deleteLock("/" + "id1");
MusicCore.deleteLock("id1");
Mockito.verify(mLockHandle).deleteLock("/" + "id1");
Code Review / music.git / commitdiff