summaryrefslogtreecommitdiff
path: root/docker
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2019-08-20 11:06:47 +0000
committerGerrit Code Review <review@openstack.org>2019-08-20 11:06:47 +0000
commit003b83cf028615633ba3d409be651a9fb9762bd4 (patch)
treef892bc585f54cddea1572a40db50f07668025d95 /docker
parentfc9ce2a36300a301f8713da954ce6d8af8de3459 (diff)
parent55344adfc67ff2c52a7bdfc5970cec636e1e4518 (diff)
downloadkolla-003b83cf028615633ba3d409be651a9fb9762bd4.tar.gz
kolla-003b83cf028615633ba3d409be651a9fb9762bd4.zip
Merge "Ensures monasca-thresh data and worker dirs exist and are empty on start up" into stable/stein
Diffstat (limited to 'docker')
-rw-r--r--docker/monasca/monasca-thresh/extend_start.sh31
1 files changed, 30 insertions, 1 deletions
diff --git a/docker/monasca/monasca-thresh/extend_start.sh b/docker/monasca/monasca-thresh/extend_start.sh
index 77e835d44..6c4dda35d 100644
--- a/docker/monasca/monasca-thresh/extend_start.sh
+++ b/docker/monasca/monasca-thresh/extend_start.sh
@@ -1,15 +1,44 @@
#!/bin/bash
-# Create log directory, with appropriate permissions
+# Create log and data directories, with appropriate permissions
MONASCA_LOG_DIR="/var/log/kolla/monasca"
+MONASCA_DATA_DIR="/var/lib/monasca-thresh/data"
+MONASCA_WORKER_DIR="/var/lib/monasca-thresh/worker-artifacts"
if [[ ! -d "$MONASCA_LOG_DIR" ]]; then
mkdir -p $MONASCA_LOG_DIR
fi
+if [[ ! -d "$MONASCA_DATA_DIR" ]]; then
+ mkdir -p $MONASCA_DATA_DIR
+fi
+if [[ ! -d "$MONASCA_WORKER_DIR" ]]; then
+ mkdir -p $MONASCA_WORKER_DIR
+fi
if [[ $(stat -c %U:%G ${MONASCA_LOG_DIR}) != "monasca:kolla" ]]; then
chown monasca:kolla ${MONASCA_LOG_DIR}
fi
+if [[ $(stat -c %U:%G ${MONASCA_DATA_DIR}) != "monasca:kolla" ]]; then
+ chown monasca:kolla ${MONASCA_DATA_DIR}
+fi
+if [[ $(stat -c %U:%G ${MONASCA_WORKER_DIR}) != "monasca:kolla" ]]; then
+ chown monasca:kolla ${MONASCA_WORKER_DIR}
+fi
if [[ $(stat -c %a ${MONASCA_LOG_DIR}) != "755" ]]; then
chmod 755 ${MONASCA_LOG_DIR}
fi
+if [[ $(stat -c %a ${MONASCA_DATA_DIR}) != "755" ]]; then
+ chmod 755 ${MONASCA_DATA_DIR}
+fi
+if [[ $(stat -c %a ${MONASCA_WORKER_DIR}) != "755" ]]; then
+ chmod 755 ${MONASCA_WORKER_DIR}
+fi
+
+# Delete the contents of data and worker-artifacts directories as
+# Apache Storm doesn't clear temp files unless shutdown gracefully.
+if [[ $(ls -Ab ${MONASCA_DATA_DIR}) != "" ]]; then
+ find ${MONASCA_DATA_DIR} -mindepth 1 -delete
+fi
+if [[ $(ls -Ab ${MONASCA_WORKER_DIR}) != "" ]]; then
+ find ${MONASCA_WORKER_DIR} -mindepth 1 -delete
+fi
. /usr/local/bin/kolla_monasca_extend_start