Skip to content

Made some fixes for the restore commands related to the search contai… #13

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.

Sign up for GitHub

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
mlaurense merged 1 commit into from
Jul 14, 2026
Merged

Made some fixes for the restore commands related to the search contai… #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 8 additions & 0 deletions commands/restore-full.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -429,6 +429,9 @@ function detectBackupServices() {
if [[ -f "$backup_path/es.tar.gz" ]]; then
services+=("elasticsearch")
fi
if [[ -f "$backup_path/os.tar.gz" ]]; then
services+=("opensearch")
fi
fi

echo "${services[@]}"
Expand Down Expand Up @@ -547,6 +550,11 @@ function restoreVolume() {
elif [[ -f "$backup_path/${service_name}.tar.gz" ]]; then
# Legacy format
backup_file="$backup_path/${service_name}.tar.gz"
elif [[ "$service_name" == "elasticsearch" && -f "$backup_path/es.tar.gz" ]]; then
# Legacy format uses short names for the search engines
backup_file="$backup_path/es.tar.gz"
elif [[ "$service_name" == "opensearch" && -f "$backup_path/os.tar.gz" ]]; then
backup_file="$backup_path/os.tar.gz"
else
logMessage WARNING "Backup file not found for service: $service_name"
logVerbose "Searched in: $backup_path/volumes/ and $backup_path/"
Expand Down
25 changes: 24 additions & 1 deletion commands/restore.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,12 @@ while [[ $# -gt 0 ]]; do
error "Unknown option: $1"
exit 1
;;
all)
# Legacy alias from the old restore interface ("roll restore all"),
# still emitted by pull/pull-exp: means all services from the latest
# backup, which is already the default — must not be taken as a backup ID
shift
;;
*)
# If no backup ID specified yet, use this as the backup ID
if [[ -z "$RESTORE_BACKUP_ID" ]]; then
Expand Down Expand Up @@ -380,8 +386,11 @@ function detectBackupServices() {
if [[ -f "$backup_path/es.tar.gz" ]]; then
services+=("elasticsearch")
fi
if [[ -f "$backup_path/os.tar.gz" ]]; then
services+=("opensearch")
fi
fi

echo "${services[@]}"
}

Expand Down Expand Up @@ -472,12 +481,26 @@ function restoreVolume() {
elif [[ -f "$backup_path/${service_name}.tar.gz" ]]; then
# Legacy format
backup_file="$backup_path/${service_name}.tar.gz"
elif [[ "$service_name" == "elasticsearch" && -f "$backup_path/es.tar.gz" ]]; then
# Legacy format uses short names for the search engines
backup_file="$backup_path/es.tar.gz"
elif [[ "$service_name" == "opensearch" && -f "$backup_path/os.tar.gz" ]]; then
backup_file="$backup_path/os.tar.gz"
else
logMessage WARNING "Backup file not found for service: $service_name"
logVerbose "Searched in: $backup_path/volumes/ and $backup_path/"
return 0
fi

# A search-index volume is only mounted when the matching engine is enabled
# in this environment's .env.roll — warn instead of silently restoring into
# a volume that no service will ever use
if [[ "$service_name" == "elasticsearch" && "${ROLL_ELASTICSEARCH:-0}" != "1" ]]; then
logMessage WARNING "Backup contains an Elasticsearch index but ROLL_ELASTICSEARCH is not enabled - the restored volume will not be mounted by 'roll env up'"
elif [[ "$service_name" == "opensearch" && "${ROLL_OPENSEARCH:-0}" != "1" ]]; then
logMessage WARNING "Backup contains an OpenSearch index but ROLL_OPENSEARCH is not enabled - the restored volume will not be mounted by 'roll env up'"
fi

logVerbose "Found backup file: $backup_file"
logVerbose "Encrypted: $is_encrypted"

Expand Down
2 changes: 1 addition & 1 deletion version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.7.0.5
0.7.0.6
Loading