@@ -173,7 +173,7 @@ backup_mssql() {
173173 compression
174174 pre_dbbackup "${DB_NAME}"
175175 print_notice "Dumping MSSQL database: '${DB_NAME}'"
176- /opt/mssql-tools /bin/sqlcmd -E - C -S ${DB_HOST}\,${DB_PORT} -U ${DB_USER} -P ${DB_PASS} – Q "BACKUP DATABASE \ [${DB_NAME}\ ] TO DISK = N'${TEMP_LOCATION}/${target}' WITH NOFORMAT, NOINIT, NAME = '${DB_NAME}-full', SKIP, NOREWIND, NOUNLOAD, STATS = 10"
176+ /opt/mssql-tools18 /bin/sqlcmd -C -S ${DB_HOST}\,${DB_PORT} -U ${DB_USER} -P ${DB_PASS} - Q "BACKUP DATABASE [${DB_NAME}] TO DISK = N'${TEMP_LOCATION}/${target}' WITH NOFORMAT, NOINIT, NAME = '${DB_NAME}-full', SKIP, NOREWIND, NOUNLOAD, STATS = 10"
177177 exit_code=$?
178178 check_exit_code $target
179179 generate_checksum
@@ -452,10 +452,13 @@ cleanup_old_data() {
452452 if [ -n "${DB_CLEANUP_TIME}" ]; then
453453 if [ "${master_exit_code}" != 1 ]; then
454454 case "${BACKUP_LOCATION,,}" in
455- "file" | "filesystem" )
455+ "file" | "filesystem" | "blobxfer" )
456456 print_info "Cleaning up old backups"
457457 mkdir -p "${DB_DUMP_TARGET}"
458458 find "${DB_DUMP_TARGET}"/ -mmin +"${DB_CLEANUP_TIME}" -iname "*" -exec rm {} \;
459+
460+ print_info "Cleaning up old backups on S3 storage with blobxfer"
461+ blobxfer upload --mode file --remote-path ${BLOBXFER_REMOTE_PATH} --local-path ${DB_DUMP_TARGET} --delete --delete-only
459462 ;;
460463 "s3" | "minio" )
461464 print_info "Cleaning up old backups"
@@ -631,6 +634,18 @@ move_dbbackup() {
631634 silent aws ${PARAM_AWS_ENDPOINT_URL} s3 cp ${TEMP_LOCATION}/*.${checksum_extension} s3://${S3_BUCKET}/${S3_PATH}/ ${s3_ssl} ${s3_ca_cert} ${S3_EXTRA_OPTS}
632635 fi
633636
637+ rm -rf "${TEMP_LOCATION}"/*."${checksum_extension}"
638+ rm -rf "${TEMP_LOCATION}"/"${target}"
639+ ;;
640+ "blobxfer" )
641+ print_info "Moving backup to S3 Bucket with blobxfer"
642+
643+ mkdir -p "${DB_DUMP_TARGET}"
644+ mv "${TEMP_LOCATION}"/*."${checksum_extension}" "${DB_DUMP_TARGET}"/
645+ mv "${TEMP_LOCATION}"/"${target}" "${DB_DUMP_TARGET}"/"${target}"
646+
647+ blobxfer upload --mode file --remote-path ${BLOBXFER_REMOTE_PATH} --local-path ${DB_DUMP_TARGET}
648+
634649 rm -rf "${TEMP_LOCATION}"/*."${checksum_extension}"
635650 rm -rf "${TEMP_LOCATION}"/"${target}"
636651 ;;
0 commit comments