diff options
| author |   Instrumental <jonathan.gathman@att.com> | 2018-11-02 16:08:34 -0500 |
|---|---|---|
| committer | Instrumental <jonathan.gathman@att.com> | 2018-11-02 16:18:43 -0500 |
| commit | 014494d662fee62eb0911b693aa6baf0ba54e26f (patch) | |
| tree | 6f4cbf62574ef7117d0320c6a8698a3fe5298dd1 /auth/auth-cass | |
| parent | 5ccce038286f0629be14fc7530d7bcd218d00616 (diff) | |
DB Recover
Single DB stoppages not recovering
Issue-ID: AAF-605
Change-Id: Ic79c2f71d5142009e7b02896e954980117037e06
Signed-off-by: Instrumental <jonathan.gathman@att.com>
Diffstat (limited to 'auth/auth-cass')
| -rw-r--r-- | auth/auth-cass/docker/dinstall.sh | 2 | ||||
| -rw-r--r-- | auth/auth-cass/docker/drun.sh | 5 | ||||
| -rw-r--r-- | auth/auth-cass/src/main/java/org/onap/aaf/auth/dao/CassAccess.java | 4 |
3 files changed, 8 insertions, 3 deletions
diff --git a/auth/auth-cass/docker/dinstall.sh b/auth/auth-cass/docker/dinstall.sh index 11bf6a15..3e5098c0 100644 --- a/auth/auth-cass/docker/dinstall.sh +++ b/auth/auth-cass/docker/dinstall.sh @@ -2,7 +2,7 @@ # # This is only called from HEAT, as it needs a single check and wait for Cassandra to be ready # -. drun.sh +. drun.sh $@ echo "Waiting for Cass to be initialized" for I in 1 2 3 4 5 6 7 8 9 10 11 12 13 14; do diff --git a/auth/auth-cass/docker/drun.sh b/auth/auth-cass/docker/drun.sh index 21de1ac4..1bcff83c 100644 --- a/auth/auth-cass/docker/drun.sh +++ b/auth/auth-cass/docker/drun.sh @@ -6,6 +6,10 @@ if [ -e ../../docker/d.props ]; then fi DOCKER=${DOCKER:-docker} +if [ "$1" = "publish" ]; then + PUBLISH='--publish 9042:9042 ' +fi + if [ "$($DOCKER volume ls | grep aaf_cass_data)" = "" ]; then $DOCKER volume create aaf_cass_data echo "Created Cassandra Volume aaf_cass_data" @@ -23,6 +27,7 @@ if [ "`$DOCKER ps -a | grep aaf_cass`" == "" ]; then -e CASSANDRA_DC=dc1 \ -e CASSANDRA_CLUSTER_NAME=osaaf \ -v "aaf_cass_data:/var/lib/cassandra" \ + $PUBLISH \ -d ${PREFIX}${ORG}/${PROJECT}/aaf_cass:${VERSION} "onap" else $DOCKER start aaf_cass diff --git a/auth/auth-cass/src/main/java/org/onap/aaf/auth/dao/CassAccess.java b/auth/auth-cass/src/main/java/org/onap/aaf/auth/dao/CassAccess.java index b8062fcd..48131860 100644 --- a/auth/auth-cass/src/main/java/org/onap/aaf/auth/dao/CassAccess.java +++ b/auth/auth-cass/src/main/java/org/onap/aaf/auth/dao/CassAccess.java @@ -215,9 +215,9 @@ public class CassAccess { } for (Resettable re : resetExceptions) { if (re.matches(e)) { - return true; + return false; } } - return false; + return true; } } |