X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=auth%2Fauth-cass%2Fcass_init%2Fcmd.sh;h=dc3e7f80978066828cead6f11c2a2bb23342233d;hb=eeb50d3b600eb5c781c53cb6f9519e503e22ca6d;hp=ba55648e07f4b8574624bf19918eefa92206f0f2;hpb=27afb0201ce717c25d8ffcc50f8b4972fc98f5c5;p=aaf%2Fauthz.git

diff --git a/auth/auth-cass/cass_init/cmd.sh b/auth/auth-cass/cass_init/cmd.sh
index ba55648e..dc3e7f80 100644
--- a/auth/auth-cass/cass_init/cmd.sh
+++ b/auth/auth-cass/cass_init/cmd.sh
@@ -49,16 +49,29 @@ function wait_start {
         echo "Waiting for Cassandra to start... Sleep 10"
         sleep 10
       else
+         status cassandra started
          break
       fi
     done
+    # Logs state Cassandra is up.  Now use cqlsh to ensure responsive
+    echo "Cassandra started, wait until it is responsive"
+    for CNT in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15; do
+      if  [ -z "$(cqlsh -e 'describe keyspaces')" ]; then
+        echo "Waiting for Cassandra to be responsive... Sleep 10"
+        sleep 10
+      else
+        echo "Cassandra responded"
+        status cassandra responsive
+	break
+      fi
+    done 
 }
 
 
 function wait_cql {
    status wait for keyspace to be initialized
    for CNT in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15; do
-     if [ -n "$(/usr/bin/cqlsh -e 'describe keyspaces' | grep authz)"  ]; then
+     if [ -n "$(cqlsh -e 'describe keyspaces' | grep authz)"  ]; then
 	break
      else
         echo "Waiting for Keyspaces to be loaded... Sleep 10"
@@ -81,12 +94,13 @@ function wait_ready {
 }
 
 function install_cql {
-    wait_start started   
+    wait_start cassandra responsive   
     # Now, make sure data exists
-    if [ ! -e $INSTALLED_VERSION ] && [ -n "$(/usr/bin/cqlsh -e 'describe keyspaces' | grep authz)" ]; then
-      /usr/bin/cqlsh -e 'DROP KEYSPACE authz' 
+    if [ ! -e $INSTALLED_VERSION ] && [ -n "$(cqlsh -e 'describe keyspaces' | grep authz)" ]; then
+      cqlsh --request-timeout=60 -e 'DROP KEYSPACE authz' 
     fi
-    if [ -z "`/usr/bin/cqlsh -e 'describe keyspaces' | grep authz`" ]; then
+
+    if [ -z "`cqlsh --request-timeout 60 -e 'describe keyspaces' | grep authz`" ]; then
         status install 
         echo "Initializing Cassandra DB" 
         echo "Docker Installed Basic Cassandra on aaf.cass.  Executing the following "
@@ -95,10 +109,10 @@ function install_cql {
         echo " cd /opt/app/aaf/cass_init"
         cd /opt/app/aaf/cass_init
         echo " cqlsh -f keyspace.cql"
-        /usr/bin/cqlsh -f keyspace.cql
+        cqlsh --request-timeout=100 -f keyspace.cql
 	status keyspace installed
         echo " cqlsh -f init.cql"
-        /usr/bin/cqlsh -f init.cql
+        cqlsh --request-timeout=100 -f init.cql
 	status data initialized
         echo ""
         echo "The following will give you a temporary identity with which to start working, or emergency"
@@ -135,7 +149,7 @@ case "$1" in
 
     # Startup like normal
     echo "Cassandra Startup"
-    exec /usr/local/bin/docker-entrypoint.sh 
+    exec -c "/usr/local/bin/docker-entrypoint.sh"
   ;;
   wait)
     # Wait for initialization.  This can be called from Docker only as a check to make sure it is ready
@@ -149,6 +163,9 @@ case "$1" in
 
     # Startup like normal
     echo "Cassandra Startup"
+    if ! cat /etc/cassandra/cassandra.yaml | grep "write_request_timeout_in_ms: 20000"; then
+      sed -i 's/write_request_timeout_in_ms: 2000/write_request_timeout_in_ms: 20000/' /etc/cassandra/cassandra.yaml
+    fi
     exec /usr/local/bin/docker-entrypoint.sh 
   ;;
 esac