diff options
| author |   Instrumental <jonathan.gathman@att.com> | 2018-11-28 06:53:55 -0600 |
|---|---|---|
| committer | Instrumental <jonathan.gathman@att.com> | 2018-11-28 06:54:02 -0600 |
| commit | a6baa197a8a0333bc90e03a135441cacb7a133b9 (patch) | |
| tree | 400a407aa0da79aca7fa3c4b2c8364267cab5eb1 /auth/auth-cass | |
| parent | 4c93571c67abd90c6da8b4ed0d5b93e1fe25887d (diff) | |
Expire, Remove Batch, restore
Issue-ID: AAF-641
Change-Id: I3d36005d59eb466141154fb729d48d5e2763fa9d
Signed-off-by: Instrumental <jonathan.gathman@att.com>
Diffstat (limited to 'auth/auth-cass')
| -rw-r--r-- | auth/auth-cass/cass_init/authBatch.props | 2 | ||||
| -rw-r--r-- | auth/auth-cass/cass_init/restore.sh | 14 |
2 files changed, 12 insertions, 4 deletions
diff --git a/auth/auth-cass/cass_init/authBatch.props b/auth/auth-cass/cass_init/authBatch.props index 90de4195..0505ce8b 100644 --- a/auth/auth-cass/cass_init/authBatch.props +++ b/auth/auth-cass/cass_init/authBatch.props @@ -18,8 +18,6 @@ DOCKER.cassandra.clusters.user=cassandra DOCKER.cassandra.clusters.password=cassandra DOCKER.VERSION=3.1.0 DOCKER.GUI_URL=https://mithrilcsp.sbc.com:8095/gui -DOCKER.punt=1 -DOCKER. DOCKER.MAX_EMAILS=3 DOCKER.SPECIAL_NAMES=aaf@aaf.osaaf.org diff --git a/auth/auth-cass/cass_init/restore.sh b/auth/auth-cass/cass_init/restore.sh index 768cf4c7..c11865b8 100644 --- a/auth/auth-cass/cass_init/restore.sh +++ b/auth/auth-cass/cass_init/restore.sh @@ -37,7 +37,11 @@ for T in $DATA; do # 2.1.14 still has NULL problems for COPY. Fixed in 2.1.15+ "approval"|"artifact"|"cred"|"ns"|"x509"|"role") $CQLSH -e "truncate $T" - UPLOAD="$UPLOAD dats/"$T + UPLOAD="$UPLOAD "$T + ;; + "history") + $CQLSH -e "truncate $T" + DO_HISTORY=true ;; *) $CQLSH -e "truncate $T; COPY authz.${T} FROM 'dats/${T}.dat' WITH DELIMITER='|'" @@ -47,6 +51,12 @@ for T in $DATA; do done if [ ! "$UPLOAD" = "" ]; then - java -DCASS_ENV=$ENV -jar aaf-auth-batch-*-full.jar Upload $UPLOAD + cd dats + java -Dcadi_prop_files=../authBatch.props -DCASS_ENV=$ENV -jar ../aaf-auth-batch-*-full.jar Upload $UPLOAD + cd - +fi + +if [ "$DO_HISTORY" = "true" ]; then + $CQLSH -e "COPY authz.history FROM 'dats/history.dat' WITH DELIMITER='|'" fi echo `date` |