Enhance ETCD backup
Pick up the helm-toolkit DB backup enhancement in etcd to add capability to retry uploading backup to remote server. Change-Id: If6ea347a4c2c55f14f35d95681aaf482d0a6103c
This commit is contained in:
parent
257ed54ddb
commit
91c21ce14e
@ -30,6 +30,9 @@ export DB_NAMESPACE=${POD_NAMESPACE}
|
|||||||
export DB_NAME="etcd"
|
export DB_NAME="etcd"
|
||||||
export LOCAL_DAYS_TO_KEEP=$NUM_TO_KEEP
|
export LOCAL_DAYS_TO_KEEP=$NUM_TO_KEEP
|
||||||
export REMOTE_DAYS_TO_KEEP=$REMOTE_BACKUP_DAYS_TO_KEEP
|
export REMOTE_DAYS_TO_KEEP=$REMOTE_BACKUP_DAYS_TO_KEEP
|
||||||
|
export REMOTE_BACKUP_RETRIES=${NUMBER_OF_RETRIES_SEND_BACKUP_TO_REMOTE}
|
||||||
|
export MIN_DELAY_SEND_REMOTE=${MIN_DELAY_SEND_BACKUP_TO_REMOTE}
|
||||||
|
export MAX_DELAY_SEND_REMOTE=${MAX_DELAY_SEND_BACKUP_TO_REMOTE}
|
||||||
export ARCHIVE_DIR=${BACKUP_DIR}/db/${DB_NAMESPACE}/${DB_NAME}/archive
|
export ARCHIVE_DIR=${BACKUP_DIR}/db/${DB_NAMESPACE}/${DB_NAME}/archive
|
||||||
|
|
||||||
dump_databases_to_directory() {
|
dump_databases_to_directory() {
|
||||||
|
@ -119,6 +119,12 @@ spec:
|
|||||||
value: "{{ .Values.backup.remote_backup.container_name }}"
|
value: "{{ .Values.backup.remote_backup.container_name }}"
|
||||||
- name: STORAGE_POLICY
|
- name: STORAGE_POLICY
|
||||||
value: "{{ .Values.backup.remote_backup.storage_policy }}"
|
value: "{{ .Values.backup.remote_backup.storage_policy }}"
|
||||||
|
- name: NUMBER_OF_RETRIES_SEND_BACKUP_TO_REMOTE
|
||||||
|
value: {{ .Values.backup.remote_backup.number_of_retries | quote }}
|
||||||
|
- name: MIN_DELAY_SEND_BACKUP_TO_REMOTE
|
||||||
|
value: {{ .Values.backup.remote_backup.delay_range.min | quote }}
|
||||||
|
- name: MAX_DELAY_SEND_BACKUP_TO_REMOTE
|
||||||
|
value: {{ .Values.backup.remote_backup.delay_range.max | quote }}
|
||||||
{{- with $env := dict "ksUserSecret" $envAll.Values.secrets.identity.kubernetes }}
|
{{- with $env := dict "ksUserSecret" $envAll.Values.secrets.identity.kubernetes }}
|
||||||
{{- include "helm-toolkit.snippets.keystone_openrc_env_vars" $env | indent 16 }}
|
{{- include "helm-toolkit.snippets.keystone_openrc_env_vars" $env | indent 16 }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
|
@ -22,5 +22,8 @@ data:
|
|||||||
REMOTE_BACKUP_CONTAINER: {{ $envAll.Values.backup.remote_backup.container_name | b64enc }}
|
REMOTE_BACKUP_CONTAINER: {{ $envAll.Values.backup.remote_backup.container_name | b64enc }}
|
||||||
REMOTE_BACKUP_DAYS_TO_KEEP: {{ $envAll.Values.backup.remote_backup.days_to_keep | quote | b64enc }}
|
REMOTE_BACKUP_DAYS_TO_KEEP: {{ $envAll.Values.backup.remote_backup.days_to_keep | quote | b64enc }}
|
||||||
REMOTE_BACKUP_STORAGE_POLICY: {{ $envAll.Values.backup.remote_backup.storage_policy | b64enc }}
|
REMOTE_BACKUP_STORAGE_POLICY: {{ $envAll.Values.backup.remote_backup.storage_policy | b64enc }}
|
||||||
|
REMOTE_BACKUP_RETRIES: {{ $envAll.Values.backup.remote_backup.number_of_retries | quote | b64enc }}
|
||||||
|
REMOTE_BACKUP_SEND_DELAY_MIN: {{ $envAll.Values.backup.remote_backup.delay_range.min | quote | b64enc }}
|
||||||
|
REMOTE_BACKUP_SEND_DELAY_MAX: {{ $envAll.Values.backup.remote_backup.delay_range.max | quote | b64enc }}
|
||||||
...
|
...
|
||||||
{{- end }}
|
{{- end }}
|
||||||
|
@ -70,6 +70,10 @@ backup:
|
|||||||
container_name: etcd
|
container_name: etcd
|
||||||
days_to_keep: 14
|
days_to_keep: 14
|
||||||
storage_policy: default-placement
|
storage_policy: default-placement
|
||||||
|
number_of_retries: 5
|
||||||
|
delay_range:
|
||||||
|
min: 30
|
||||||
|
max: 60
|
||||||
|
|
||||||
endpoints:
|
endpoints:
|
||||||
identity:
|
identity:
|
||||||
|
Loading…
Reference in New Issue
Block a user