Merge pull request #36738 from wojtek-t/fix_rollback_etcd3

Automatic merge from submit-queue

Remove v2 data before etcd rollback

Fix #36555
pull/6/head
Kubernetes Submit Queue 2016-11-15 16:09:15 -08:00 committed by GitHub
commit fedf17826b
1 changed files with 6 additions and 0 deletions

View File

@ -223,6 +223,12 @@ if [ "${CURRENT_STORAGE}" = "etcd3" -a "${TARGET_STORAGE}" = "etcd2" ]; then
echo "etcd3 -> etcd2 downgrade is supported only between 3.0.x and 2.3.7" echo "etcd3 -> etcd2 downgrade is supported only between 3.0.x and 2.3.7"
return 0 return 0
fi fi
echo "Backup and remove all existing v2 data"
ROLLBACK_BACKUP_DIR="${DATA_DIRECTORY}.bak"
rm -rf "${ROLLBACK_BACKUP_DIR}"
mkdir -p "${ROLLBACK_BACKUP_DIR}"
cp -r "${DATA_DIRECTORY}" "${ROLLBACK_BACKUP_DIR}"
rm -rf "${DATA_DIRECTORY}"/member/snap/*.snap
echo "Performing etcd3 -> etcd2 rollback" echo "Performing etcd3 -> etcd2 rollback"
${ROLLBACK} --data-dir "${DATA_DIRECTORY}" ${ROLLBACK} --data-dir "${DATA_DIRECTORY}"
if [ "$?" -ne "0" ]; then if [ "$?" -ne "0" ]; then