openstack
/
kolla
Code Issues Proposed changes

Merge "Ensures monasca-thresh data and worker dirs exist and are empty on start up" into stable/stein

This commit is contained in:
Zuul 2019-08-20 11:06:47 +00:00 committed by Gerrit Code Review
parent fc9ce2a363 55344adfc6
commit 003b83cf02
1 changed files with 30 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
docker/monasca/monasca-thresh/extend_start.sh
View File

@ -1,15 +1,44 @@
#!/bin/bash #!/bin/bash
# Create log directory, with appropriate permissions # Create log and data directories, with appropriate permissions
MONASCA_LOG_DIR="/var/log/kolla/monasca" 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 if [[ ! -d "$MONASCA_LOG_DIR" ]]; then
mkdir -p $MONASCA_LOG_DIR mkdir -p $MONASCA_LOG_DIR
fi 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 if [[ $(stat -c %U:%G ${MONASCA_LOG_DIR}) != "monasca:kolla" ]]; then
chown monasca:kolla ${MONASCA_LOG_DIR} chown monasca:kolla ${MONASCA_LOG_DIR}
fi 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 if [[ $(stat -c %a ${MONASCA_LOG_DIR}) != "755" ]]; then
chmod 755 ${MONASCA_LOG_DIR} chmod 755 ${MONASCA_LOG_DIR}
fi 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 . /usr/local/bin/kolla_monasca_extend_start