From a27be9fdbbf2d271c9c5780ba70fe15a24dbdb63 Mon Sep 17 00:00:00 2001 From: "Nelson,Thomas(tn1381)(arthurdent3)" Date: Tue, 29 Jan 2019 15:55:37 -0500 Subject: Push variuos changes - Spring Boot - Cadi - Cassandra Locking Change-Id: Ie9882f81f0ca141bdb7862cdabf978481fcd7c4a Issue-ID: MUSIC-296,MUSIC-272 Signed-off-by: Nelson,Thomas(tn1381)(arthurdent3) --- distribution/cassandra/docker-entrypoint.sh | 79 +++++++++++++++++++++-------- distribution/cassandra/music.cql | 20 -------- distribution/cassandra/music_single.cql | 20 -------- 3 files changed, 59 insertions(+), 60 deletions(-) delete mode 100644 distribution/cassandra/music.cql delete mode 100644 distribution/cassandra/music_single.cql (limited to 'distribution/cassandra') diff --git a/distribution/cassandra/docker-entrypoint.sh b/distribution/cassandra/docker-entrypoint.sh index 20bf272f..a42d498e 100644 --- a/distribution/cassandra/docker-entrypoint.sh +++ b/distribution/cassandra/docker-entrypoint.sh @@ -1,13 +1,6 @@ #!/bin/bash set -e -# Removal for issues with Kubernetes - Need to make sure any injected files -# Are chown 664 or ID is smae ID as Cassandra in Container. -#for f in /docker-entrypoint-initdb.d/*.cql; do -# chown cassandra.root "$f" -#done - - # first arg is `-f` or `--some-option` # or there are no args if [ "$#" -eq 0 ] || [ "${1#-}" != "$1" ]; then @@ -20,18 +13,30 @@ if [ "$1" = 'cassandra' -a "$(id -u)" = '0' ]; then exec gosu cassandra "$BASH_SOURCE" "$@" fi +_ip_address() { + # scrape the first non-localhost IP address of the container + # in Swarm Mode, we often get two IPs -- the container IP, and the (shared) VIP, and the container IP should always be first + ip address | awk ' + $1 == "inet" && $NF != "lo" { + gsub(/\/.+$/, "", $2) + print $2 + exit + } + ' +} + if [ "$1" = 'cassandra' ]; then : ${CASSANDRA_RPC_ADDRESS='0.0.0.0'} : ${CASSANDRA_LISTEN_ADDRESS='auto'} if [ "$CASSANDRA_LISTEN_ADDRESS" = 'auto' ]; then - CASSANDRA_LISTEN_ADDRESS="$(hostname --ip-address)" + CASSANDRA_LISTEN_ADDRESS="$(_ip_address)" fi : ${CASSANDRA_BROADCAST_ADDRESS="$CASSANDRA_LISTEN_ADDRESS"} if [ "$CASSANDRA_BROADCAST_ADDRESS" = 'auto' ]; then - CASSANDRA_BROADCAST_ADDRESS="$(hostname --ip-address)" + CASSANDRA_BROADCAST_ADDRESS="$(_ip_address)" fi : ${CASSANDRA_BROADCAST_RPC_ADDRESS:=$CASSANDRA_BROADCAST_ADDRESS} @@ -68,8 +73,23 @@ if [ "$1" = 'cassandra' ]; then done fi -echo "Updating username and password" -for f in /docker-entrypoint-initdb.d/music*.cql; do +echo "#############################################" +echo "############## Update music.cql #############" +echo "#############################################" + +for f in /docker-entrypoint-initdb.d/a_music.cql; do + if [ "${MUSIC_REPLICATION_CLASS}" ]; then + sed -ri 's/REPLICATION_CLASS/'${MUSIC_REPLICATION_CLASS}'/' "$f" + fi + if [ "${MUSIC_REPLICATION_FACTOR}" ]; then + sed -ri 's/REPLICATION_FACTOR/'${MUSIC_REPLICATION_FACTOR}'/' "$f" + fi +done + +echo "#############################################" +echo "######Updating username and password #######" +echo "#############################################" +for f in /docker-entrypoint-initdb.d/b_pw.cql; do if [ "${CASSUSER}" ]; then sed -ri 's/CASSUSER/'${CASSUSER}'/' "$f" fi @@ -77,20 +97,39 @@ for f in /docker-entrypoint-initdb.d/music*.cql; do sed -ri 's/CASSPASS/'${CASSPASS}'/' "$f" fi done -echo "Updating username and password - Complete" - - - -echo "################################ Let run cql's ##############################" +echo "#############################################" +echo "############## Let run cql's ################" +echo "#############################################" for f in /docker-entrypoint-initdb.d/*; do - case "$f" in - *.cql) - echo "$0: running $f" && until cqlsh -u cassandra -p cassandra -f "$f"; do >&2 echo "Cassandra is unavailable - sleeping"; sleep 2; done & ;; + *zzz*.cql) + echo "$0: running $f" && until $AM && cqlsh -u ${CASSUSER} -p ${CASSPASS} -f "$f"; + do >&2 echo "Cassandra is unavailable - sleeping [${f}] $C";let C=C+1; sleep 5; done & ;; + *a_music.cql) + echo "$0: running $f" && until $PW && cqlsh -u ${CASSUSER} -p ${CASSPASS} -f "$f" && AM=true; + do >&2 echo "Cassandra is unavailable - sleeping [${f}] $D";let D=D+1; sleep 5; done & ;; + *b_pw.cql) + echo "$0: running $f" && until cqlsh -u cassandra -p cassandra -f "$f" && PW=true; + do >&2 echo "Cassandra is unavailable - sleeping [${f}] $E";let E=E+1; sleep 5; done & ;; *) echo "$0: ignoring $f" ;; esac + echo done -exec "$@" + +echo "#############################################" +echo "########### Running Password CQL ############" +echo "#############################################" + +#echo "$0: running $f" && +#until cqlsh -u cassandra -p cassandra -f /pw.cql; +#do >&2 echo "Cassandra is unavailable - sleeping"; sleep 10; done + +echo "#############################################" +echo "########### Cassandra Running ###############" +echo "#############################################" + + +exec "$@" \ No newline at end of file diff --git a/distribution/cassandra/music.cql b/distribution/cassandra/music.cql deleted file mode 100644 index d991a514..00000000 --- a/distribution/cassandra/music.cql +++ /dev/null @@ -1,20 +0,0 @@ -CREATE KEYSPACE admin - WITH REPLICATION = { - 'class' : 'SimpleStrategy', - 'replication_factor': 1 - } - AND DURABLE_WRITES = true; - -CREATE TABLE admin.keyspace_master ( - uuid uuid, - keyspace_name text, - application_name text, - is_api boolean, - password text, - username text, - is_aaf boolean, - PRIMARY KEY (uuid) -); - -CREATE USER nelson24 WITH PASSWORD ‘winman123’ SUPERUSER; -ALTER USER cassandra WITH PASSWORD ‘SomeLongRandomStringNoonewillthinkof’; diff --git a/distribution/cassandra/music_single.cql b/distribution/cassandra/music_single.cql deleted file mode 100644 index b8a60cd1..00000000 --- a/distribution/cassandra/music_single.cql +++ /dev/null @@ -1,20 +0,0 @@ -CREATE KEYSPACE IF NOT EXISTS admin - WITH REPLICATION = { - 'class' : 'SimpleStrategy', - 'replication_factor': 1 - } - AND DURABLE_WRITES = true; - -CREATE TABLE IF NOT EXISTS admin.keyspace_master ( - uuid uuid, - keyspace_name text, - application_name text, - is_api boolean, - password text, - username text, - is_aaf boolean, - PRIMARY KEY (uuid) -); - -CREATE ROLE IF NOT EXISTS CASSUSER WITH PASSWORD = 'CASSPASS' AND SUPERUSER = True AND LOGIN = True; -ALTER ROLE cassandra WITH PASSWORD = 'SomeLongRandomStringNoonewillthinkof'; -- cgit 1.2.3-korg