Skip to content
Merged
Show file tree
Hide file tree
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
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ apiVersion: gateway.networking.k8s.io/v1
kind: BackendTLSPolicy
metadata:
name: powa-ui-backend-tls-policy
labels:
{{ include "kubernetes.labels" . | nindent 4 }}
spec:
targetRefs:
- group: ""
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ apiVersion: gateway.networking.k8s.io/v1
kind: HTTPRoute
metadata:
name: powa-ui-httproute
labels:
{{ include "kubernetes.labels" . | nindent 4 }}
spec:
parentRefs:
- name: {{ .Values.powaUI.ingress.gatewayName | default "default-external-gateway" }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ apiVersion: gateway.networking.k8s.io/v1
kind: HTTPRoute
metadata:
name: powa-ui-frontend-redirect
labels:
{{ include "kubernetes.labels" . | nindent 4 }}
spec:
parentRefs:
- name: {{ .Values.powaUI.ingress.gatewayName | default "default-external-gateway" }}
Expand Down
5 changes: 4 additions & 1 deletion services/backup-daemon/docker/granular/pg_backup.py
Original file line number Diff line number Diff line change
Expand Up @@ -525,7 +525,8 @@ def process_backup_request(self):
self.backup_single_database(database)
self.on_success(database)
except Exception as e: # Call on_failure here to mark database backup failed on any exception.
self.on_failure(database, e)
if not self.is_cancelled():
self.on_failure(database, e)
raise e
finally:
self.cleanup(database)
Expand Down Expand Up @@ -573,6 +574,8 @@ def run(self):
self._mark_done(backups.BackupStatus.SUCCESSFUL)
self.log.info(self.log_msg("Backup request processing has been completed."))
except Exception as e:
if self.is_cancelled():
return
self.log.exception(self.log_msg("Backup request processing has failed."))
self.update_status('errorMessage', f'Backup failed: {e}')
self._mark_done(backups.BackupStatus.FAILED)
Expand Down
2 changes: 1 addition & 1 deletion tests/robot/check_terminate_backup_api/keywords.robot
Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,4 @@ Prepare Auth
${POSTGRES_USER}= Get Environment Variable POSTGRES_USER default=postgres
${PG_ROOT_PASSWORD}= Get Environment Variable PG_ROOT_PASSWORD
${auth}= Create List ${POSTGRES_USER} ${PG_ROOT_PASSWORD}
reterun ${auth}
[Return] ${auth}
Loading