From: Instrumental <jonathan.gathman@att.com>
Date: Fri, 2 Nov 2018 21:08:34 +0000 (-0500)
Subject: DB Recover
X-Git-Tag: 2.1.7~8
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=aaf%2Fauthz.git;a=commitdiff_plain;h=014494d662fee62eb0911b693aa6baf0ba54e26f

DB Recover

Single DB stoppages not recovering

Issue-ID: AAF-605
Change-Id: Ic79c2f71d5142009e7b02896e954980117037e06
Signed-off-by: Instrumental <jonathan.gathman@att.com>
---

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;
     }
 }
diff --git a/version.properties b/version.properties
index 2400e4d3..306bccf6 100644
--- a/version.properties
+++ b/version.properties
@@ -17,8 +17,6 @@
 # See the License for the specific language governing permissions and 
 # limitations under the License.
 # ============LICENSE_END============================================
-# ===================================================================
-# ECOMP is a trademark and service mark of AT&T Intellectual Property.
 ###
 
 # Versioning variables