summaryrefslogtreecommitdiffstats
path: root/auth/auth-cass/cass_init
diff options
context:
space:
mode:
authorInstrumental <jonathan.gathman@att.com>2019-02-26 13:12:00 -0600
committerInstrumental <jonathan.gathman@att.com>2019-02-26 14:41:05 -0600
commitc5705cdbe98f13e1dd4b64040390ea389a6065c2 (patch)
tree2091f530f8786f774628a5002fcb545563c8d74d /auth/auth-cass/cass_init
parente56243c25704fe117a076ac8eed1f47280d31ed2 (diff)
Improve Batch Bulk Load
Issue-ID: AAF-775 Change-Id: Ib2d6ff3607a30c6e8d74ff24498e5907237d6ff2 Signed-off-by: Instrumental <jonathan.gathman@att.com>
Diffstat (limited to 'auth/auth-cass/cass_init')
-rw-r--r--auth/auth-cass/cass_init/cmd.sh4
-rw-r--r--auth/auth-cass/cass_init/push.sh6
2 files changed, 3 insertions, 7 deletions
diff --git a/auth/auth-cass/cass_init/cmd.sh b/auth/auth-cass/cass_init/cmd.sh
index ca1c0e82..b26536d6 100644
--- a/auth/auth-cass/cass_init/cmd.sh
+++ b/auth/auth-cass/cass_init/cmd.sh
@@ -97,10 +97,10 @@ function install_cql {
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 --timeout 60 -e 'DROP KEYSPACE authz'
+ /usr/bin/cqlsh --request-timeout=60 -e 'DROP KEYSPACE authz'
fi
- if [ -z "`/usr/bin/cqlsh --timeout 60 -e 'describe keyspaces' | grep authz`" ]; then
+ if [ -z "`/usr/bin/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 "
diff --git a/auth/auth-cass/cass_init/push.sh b/auth/auth-cass/cass_init/push.sh
index f3e5d80d..f887f077 100644
--- a/auth/auth-cass/cass_init/push.sh
+++ b/auth/auth-cass/cass_init/push.sh
@@ -35,11 +35,7 @@ fi
cd dats
for T in $(ls *.dat); do
if [ -s $T ]; then
- until cqlsh --request-timeout=60 -e "COPY authz.${T/.dat/} FROM '$T' WITH DELIMITER='|';";
- do
- echo "Unexpected failure...sleep for 10 seconds and try again"
- sleep 10
- done
+ cqlsh --request-timeout=100 -e "COPY authz.${T/.dat/} FROM '$T' WITH DELIMITER='|';";
fi
done
cd $DIR