Skip to content

Checksum fix #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 15, 2025
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 32 additions & 15 deletions application/backup.sh
Original file line number Diff line number Diff line change
@@ -73,6 +73,17 @@ sha256sum "${DB_NAME}.sql" > "${DB_NAME}.sql.sha256" || {
error_to_sentry "${error_message}" "${DB_NAME}" "1";
exit 1;
}
log "DEBUG" "Checksum file contents: $(cat "${DB_NAME}.sql.sha256")";

# Validate checksum
log "INFO" "${MYNAME}: Validating backup checksum";
sha256sum -c "${DB_NAME}.sql.sha256" || {
error_message="${MYNAME}: FATAL: Checksum validation failed for backup of ${DB_NAME}";
log "ERROR" "${error_message}";
error_to_sentry "${error_message}" "${DB_NAME}" "1";
exit 1;
}
log "INFO" "${MYNAME}: Checksum validation successful";

# Compression
start=$(date +%s);
@@ -88,29 +99,32 @@ else
log "INFO" "${MYNAME}: Compressing backup of ${DB_NAME} completed in $(expr ${end} - ${start}) seconds.";
fi

# Validate checksum
log "INFO" "Validating backup checksum"
# Optional: Added this line for debug
log "DEBUG" "Checksum file contents: $(cat "${DB_NAME}.sql.sha256")"

sha256sum -c "${DB_NAME}.sql.sha256" || {
error_message="${MYNAME}: FATAL: Checksum validation failed for backup of ${DB_NAME}";
log "ERROR" "${error_message}";
error_to_sentry "${error_message}" "${DB_NAME}" "1";
exit 1;
}
# Compress checksum file
gzip -f "${DB_NAME}.sql.sha256";
if [ $? -ne 0 ]; then
log "WARN" "${MYNAME}: Failed to compress checksum file, but continuing backup process";
fi

# S3 Upload
# Upload compressed backup file to S3
start=$(date +%s);
s3cmd put /tmp/${DB_NAME}.sql.gz ${S3_BUCKET} || STATUS=$?;
end=$(date +%s);
if [ $STATUS -ne 0 ]; then
error_message="${MYNAME}: FATAL: Copy backup to ${S3_BUCKET} of ${DB_NAME} returned non-zero status ($STATUS) in $(expr ${end} - ${start}) seconds.";
log "ERROR" "${error_message}";
error_to_sentry "${error_message}" "${DB_NAME}" "${STATUS}";
exit $STATUS;
fi

# Upload checksum file
s3cmd put /tmp/${DB_NAME}.sql.sha256.gz ${S3_BUCKET} || STATUS=$?;
end=$(date +%s);
if [ $STATUS -ne 0 ]; then
error_message="${MYNAME}: FATAL: Copy checksum to ${S3_BUCKET} of ${DB_NAME} returned non-zero status ($STATUS).";
log "ERROR" "${error_message}";
error_to_sentry "${error_message}" "${DB_NAME}" "${STATUS}";
exit $STATUS;
else
log "INFO" "${MYNAME}: Copy backup to ${S3_BUCKET} of ${DB_NAME} completed in $(expr ${end} - ${start}) seconds.";
log "INFO" "${MYNAME}: Copy backup and checksum to ${S3_BUCKET} of ${DB_NAME} completed in $(expr ${end} - ${start}) seconds.";
fi

# Backblaze B2 Upload
@@ -136,6 +150,9 @@ fi

echo "postgresql-backup-restore: backup: Completed";

# Clean up temporary files
rm -f "/tmp/${DB_NAME}.sql.gz" "/tmp/${DB_NAME}.sql.sha256.gz";

log "INFO" "${MYNAME}: backup: Completed";

exit $STATUS;
exit $STATUS;