[helm] sync STRUCT_LOG_TCP_ADDR and azure config for backup

Closes: diem#7822
bob-wilson · Mar 6, 2021 · b00b230 · b00b230
1 parent 486dc12
commit b00b230
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 2 deletions.
diff --git a/helm/fullnode/files/backup/azure.toml b/helm/fullnode/files/backup/azure.toml
@@ -11,6 +11,6 @@ create_for_write = '''
 open_for_read = 'azcopy cp --from-to BlobPipe "https://$ACCOUNT.blob.core.windows.net/$CONTAINER/$SUB_DIR/$FILE_HANDLE$SAS" < /dev/null | gzip -cd'
 save_metadata_line= 'gzip -c | azcopy cp --from-to PipeBlob "https://$ACCOUNT.blob.core.windows.net/$CONTAINER/$SUB_DIR/metadata/$FILE_NAME$SAS"'
 list_metadata_files = '''
-    (azcopy ls "https://$ACCOUNT.blob.core.windows.net/$CONTAINER/$SUB_DIR/metadata$SAS" ||:) \
-    | sed -ne "s#INFO: \(.*\); Content Length:.*#metadata/\1#p"
+    (azcopy ls "https://$ACCOUNT.blob.core.windows.net/$CONTAINER/$SUB_DIR/metadata/$SAS" ||:) \
+    | sed -ne "s#; .*##;s#INFO: \(.*\)#metadata/\1#p"
 '''
diff --git a/helm/fullnode/templates/_helpers.tpl b/helm/fullnode/templates/_helpers.tpl
@@ -129,3 +129,7 @@ Create the name of the service account to use
 {{ .Values.backup.pushGateway }}
 {{- end -}}
 {{- end -}}
+
+{{- define "backup.loggingAddress" -}}
+{{ .Values.logging.address }}
+{{- end -}}
diff --git a/helm/fullnode/templates/backup-verify.yaml b/helm/fullnode/templates/backup-verify.yaml
@@ -43,6 +43,8 @@ spec:
               value: "debug"
             - name: RUST_BACKTRACE
               value: "1"
+            - name: STRUCT_LOG_TCP_ADDR
+              value: {{ include "backup.loggingAddress" $ | quote }}
             - name: PUSH_METRICS_ENDPOINT
               value: "{{- include "backup.pushGateway" $ }}/metrics/job/{{- .Values.backup_verify.jobName | default "db_backup_verify" }}"
             {{- include "backup.backupEnvironment" (dict "config" $.Values.backup.config "era" $.Values.chain.era) | nindent 12 }}

diff --git a/helm/fullnode/templates/backup.yaml b/helm/fullnode/templates/backup.yaml
@@ -60,6 +60,8 @@ spec:
           value: "debug"
         - name: RUST_BACKTRACE
           value: "1"
+        - name: STRUCT_LOG_TCP_ADDR
+          value: {{ include "backup.loggingAddress" $ | quote }}
         {{- if (include "backup.pushGateway" $) }}
         - name: PUSH_METRICS_ENDPOINT
           value: "{{- include "backup.pushGateway" $ }}/metrics/job/{{- .jobName | default "db_backup" }}"

diff --git a/helm/fullnode/templates/restore.yaml b/helm/fullnode/templates/restore.yaml
@@ -41,6 +41,8 @@ spec:
           value: "debug"
         - name: RUST_BACKTRACE
           value: "1"
+        - name: STRUCT_LOG_TCP_ADDR
+          value: {{ include "backup.loggingAddress" $ | quote }}
         {{- if (include "backup.pushGateway" $) }}
         - name: PUSH_METRICS_ENDPOINT
           value: "{{- include "backup.pushGateway" $ }}/metrics/job/{{- .jobName | default "db_restore" }}"