Commit 76f8ad91 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Corrige rutas de backup, omite volumen innecesario 

La herramienta redis-cli manda a hacer el dump pero también se encarga
de transferirlo de vuelta, por lo que no es necesario irlo a buscar.
parent 5629da5e

deploy/.env

+1 −2
Original line number Diff line number Diff line 
REDIS_HOST=vmq-redis

REDIS_PORT=6379

REMOTE_BACKUP_PATH=/data

LOCAL_BACKUP_PATH=/redis

BACKUP_PATH=/redis

AWS_BUCKET=backup.vmq-redis

AWS_ACCESS_KEY_ID=changeme

AWS_SECRET_ACCESS_KEY=changeme

deploy/docker-compose.tmpl.yml

+1 −9
Original line number Diff line number Diff line
@@ -6,8 +6,7 @@ services: 
    environment:

      - REDIS_HOST

      - REDIS_PORT

      - REMOTE_BACKUP_PATH

      - LOCAL_BACKUP_PATH

      - BACKUP_PATH

      - AWS_BUCKET

      - AWS_ACCESS_KEY_ID

      - AWS_SECRET_ACCESS_KEY
@@ -17,8 +16,6 @@ services: 
    networks:

      - vernemq-net

      - metric-net

    volumes:

      - redis-data-vol:/redis

    deploy:

      mode: replicated

      replicas: 1
@@ -41,8 +38,3 @@ networks: 
  metric-net:

    name: ${METRIC_NET_NAME:-metric-net}

    external: true
 


volumes:

  redis-data-vol:

    name: ${REDIS_DATA_VOL_NAME:-vernemq-redis-data-vol}

    external: true

script/entrypoint.sh

+5 −8
Original line number Diff line number Diff line
@@ -2,8 +2,7 @@ 


REDIS_HOST="${REDIS_HOST:-vmq-redis}"

REDIS_PORT="${REDIS_PORT:-6379}"

REMOTE_BACKUP_PATH="${REMOTE_BACKUP_PATH:-/data}"

LOCAL_BACKUP_PATH="${LOCAL_BACKUP_PATH:-/redis}"

BACKUP_PATH="${BACKUP_PATH:-/redis}"



if [ -z "${AWS_BUCKET}" ]

then
@@ -25,10 +24,10 @@ fi 


startSeconds=$(date +%s)



currentDate=$(date +%Y-%m-%d_%H_%M_%S)

currentDate=$(date +%Y-%m-%d_%H-%M-%S)

backupFilename="vmq-redis-dump-${currentDate}.rdb"



if redis-cli -h ${REDIS_HOST} -p ${REDIS_PORT} --rdb "${REMOTE_BACKUP_PATH}/${backupFilename}"

if redis-cli -h ${REDIS_HOST} -p ${REDIS_PORT} --rdb "${BACKUP_PATH}/${backupFilename}"

then

	echo "Backup successfully created"

else
@@ -36,19 +35,17 @@ else 
	exit 1

fi



backupSize=$(stat -c %s "${LOCAL_BACKUP_PATH}/${backupFilename}")

backupSize=$(stat -c %s "${BACKUP_PATH}/${backupFilename}")



if [ ${backupSize} -eq 0 ]

then

	echo "Error! Backup file is empty"

	rm -f "${LOCAL_BACKUP_PATH}/${backupFilename}"

	exit 1

fi



if aws s3 cp "${LOCAL_BACKUP_PATH}/${backupFilename}" s3://${AWS_BUCKET}

if aws s3 cp "${BACKUP_PATH}/${backupFilename}" s3://${AWS_BUCKET}

then

	echo "Backup successfully uploaded"

	rm -f "${LOCAL_BACKUP_PATH}/${backupFilename}"

else

	echo "Backup upload failed!"

	exit 1