Skip to content

Commit c46b232

Browse files
author
Sven Speckmaier
committed
fixed xtrabackup call in FULL mode
1 parent 9cb98eb commit c46b232

File tree

1 file changed

+15
-8
lines changed

1 file changed

+15
-8
lines changed

entrypoint

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,19 @@ set -e
1010
#
1111
MODE="${MODE:-SIMPLE}"
1212
RUN_EVERY="${RUN_EVERY:-}"
13+
RESTORE_STACK="${RESTORE_STACK:-}"
14+
RANCHER_URL="${RANCHER_URL:-}"
15+
RANCHER_ACCESS_KEY="${RANCHER_ACCESS_KEY}"
16+
RANCHER_SECRET_KEY="${RANCHER_SECRET_KEY}"
17+
BACKUP_VOLUME="${BACKUP_VOLUME:-}"
18+
BACKUP_DRIVER="${BACKUP_DRIVER:-}"
19+
STORAGEBOX_URL="${STORAGEBOX_URL:-}"
20+
STORAGEBOX_USER="${STORAGEBOX_USER:-}"
21+
STORAGEBOX_PASSWORD="${STORAGEBOX_PASSWORD:-}"
22+
MYSQL_PASSWORD="${MYSQL_PASSWORD:-}"
23+
MYSQL_HOST="${MYSQL_HOST:-}"
24+
MYSQL_PORT="${MYSQL_PORT}"
25+
RANCHER_CLI_VERSION="${RANCHER_CLI_VERSION:-v0.4.1}"
1326

1427
TARGET_PREFIX="/target"
1528
DATA_DIRECTORY="/var/lib/mysql"
@@ -43,7 +56,7 @@ createRestoreService() {
4356

4457
TARGET_BACKUP="$1"
4558

46-
if [ -z "$RESTORE_STACK" ] ; then
59+
if [ -z "${RESTORE_STACK}" ] ; then
4760
echo "RESTORE_STACK environment variable not set, not creating a restore service"
4861
return
4962
fi
@@ -126,11 +139,6 @@ backupRancher() {
126139
return
127140
fi
128141

129-
if [ -z "$RANCHER_CLI_VERSION" ] ; then
130-
echo "Defaulting to rancher-cli Version v0.4.1"
131-
RANCHER_CLI_VERSION="v0.4.1"
132-
fi
133-
134142
RANCHER_CLI_DIRECTORY="/opt/rancher/${RANCHER_CLI_VERSION}"
135143
if [ ! -d "$RANCHER_CLI_DIRECTORY" ] ; then
136144
mkdir -p "$RANCHER_CLI_DIRECTORY"
@@ -228,7 +236,6 @@ backup() {
228236
else
229237
# Backup - copies innodb files and reads binary log while doing so
230238
xtrabackup --backup --datadir="$DATA_DIRECTORY" \
231-
--incremental-basedir=/data/backups/base\
232239
--target-dir="$TARGET" ${USER[@]} ${PASSWORD[@]} \
233240
--host "${MYSQL_HOST}" --port ${MYSQL_PORT}
234241
fi
@@ -343,7 +350,7 @@ case $1 in
343350
;;
344351
help)
345352
shift
346-
usage $*
353+
usage
347354
exit 0
348355
;;
349356
*)

0 commit comments

Comments
 (0)