summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorInstrumental <jonathan.gathman@att.com>2019-02-26 06:45:39 -0600
committerInstrumental <jonathan.gathman@att.com>2019-02-26 06:45:44 -0600
commite56243c25704fe117a076ac8eed1f47280d31ed2 (patch)
tree44d8c398265ae38b9b237fc4879a35bcd6bd8f1f
parent40fad64132a671731e37ce97911a03db72ff7ecf (diff)
mv cqlsh check to wait_start
Move the check on Cassandra responsiveness to wait_start, and increase new timeout on CQL loads. Issue-ID: AAF-773 Change-Id: I14f2dd4efe6eb8bb150334a28ff4a9a5e63bf964 Signed-off-by: Instrumental <jonathan.gathman@att.com>
-rw-r--r--auth/auth-cass/cass_init/cmd.sh29
1 files changed, 19 insertions, 10 deletions
diff --git a/auth/auth-cass/cass_init/cmd.sh b/auth/auth-cass/cass_init/cmd.sh
index d43e07d4..ca1c0e82 100644
--- a/auth/auth-cass/cass_init/cmd.sh
+++ b/auth/auth-cass/cass_init/cmd.sh
@@ -49,9 +49,22 @@ 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
}
@@ -81,29 +94,25 @@ 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'
+ /usr/bin/cqlsh --timeout 60 -e 'DROP KEYSPACE authz'
fi
- if [ -z "`/usr/bin/cqlsh -e 'describe keyspaces' | grep authz`" ]; then
+
+ if [ -z "`/usr/bin/cqlsh --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 "
echo "NOTE: This creator provided is only a Single Instance. For more complex Cassandra, create independently"
echo ""
- until /usr/bin/cqlsh -e 'describe keyspaces';
- do
- echo "Cassandra DB is not up Yet!! Trying in 10 seconds"
- sleep 10
- done
echo " cd /opt/app/aaf/cass_init"
cd /opt/app/aaf/cass_init
echo " cqlsh -f keyspace.cql"
- /usr/bin/cqlsh --request-timeout=60 -f keyspace.cql
+ /usr/bin/cqlsh --request-timeout=100 -f keyspace.cql
status keyspace installed
echo " cqlsh -f init.cql"
- /usr/bin/cqlsh --request-timeout=60 -f init.cql
+ /usr/bin/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"