Skip to content
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

Jump to bottom

Support sync bucket in lightning #1629

Merged
merged 4 commits into from
Mar 16, 2020
Merged

Support sync bucket in lightning #1629

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
98683c2
Support sync bucket in lightning
aylei Feb 4, 2020
c66b7d1
fix nodeSelector is not respected in tidb-lightning chart
aylei Feb 5, 2020
eaa6007
Fix nodeSelector indention
aylei Mar 16, 2020
a69985c
Merge master
aylei Mar 16, 2020
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
4 changes: 4 additions & 0 deletions charts/tidb-lightning/templates/job.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,10 @@ spec:
{{- if .Values.affinity }}
affinity:
{{ toYaml .Values.affinity | indent 6 }}
{{- end }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 8 }}
{{- end }}
{{- if .Values.tolerations }}
tolerations:
Expand Down
5 changes: 5 additions & 0 deletions charts/tidb-lightning/templates/scripts/_start_data_retriever.sh.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
set -euo pipefail
{{ if .Values.dataSource.remote.directory }}
# rclone sync skip identical files automatically
rclone --config /etc/rclone/rclone.conf sync -P {{ .Values.dataSource.remote.directory}} /data
{{- else -}}
filename=$(basename {{ .Values.dataSource.remote.path }})
if find /data -name metadata | egrep '.*'; then
echo "data already exist"
Expand All @@ -7,3 +11,4 @@ else
rclone --config /etc/rclone/rclone.conf copy -P {{ .Values.dataSource.remote.path }} /data
cd /data && tar xzvf ${filename}
fi
{{- end -}}
10 changes: 10 additions & 0 deletions charts/tidb-lightning/templates/scripts/_start_lightning.sh.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,16 @@
data_dir={{ .Values.dataSource.local.hostPath }}
{{- else if .Values.dataSource.adhoc.pvcName -}}
data_dir=/var/lib/tidb-lightning/{{ .Values.dataSource.adhoc.backupName | default .Values.dataSource.adhoc.pvcName }}
{{- else if .Values.dataSource.remote.directory -}}
data_dir=/var/lib/tidb-lightning
if [ -z "$(ls -A ${data_dir})" ]; then
if [ ! -z ${FAIL_FAST} ]; then
exit 1
else
echo "No files in data dir, please exec into my container to diagnose"
tail -f /dev/null
fi
fi
{{- else -}}
data_dir=$(dirname $(find /var/lib/tidb-lightning -name metadata 2>/dev/null) 2>/dev/null)
if [ -z $data_dir ]; then
Expand Down
2 changes: 2 additions & 0 deletions charts/tidb-lightning/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ dataSource:
storage: 100Gi
secretName: cloud-storage-secret
path: s3:bench-data-us/sysbench/sbtest_16_1e7.tar.gz
# Directory support downloading all files in a remote directory, shadow dataSoure.remote.path if present
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What about reusing the path for this? If a path ends with /, then it is a directory.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I agree with the current solution, reusing the path might be more complex for developers and users.

# directory: s3:bench-data-us
# If rcloneConfig is configured, then `secretName` will be ignored,
# `rcloneConfig` should only be used for the cases where no sensitive
# information need to be configured, e.g. the configuration as below,
Expand Down