Skip to content

Commit 8af029e

Browse files
author
Daniel Isen
committed
[Platform] Install s3cmd on YW yugabyte#5593
Summary: Encrypted backup/restore flow requires s3cmd to be available on YW machine for S3 backups. Still need a solution for azcopy and gsutil as they can't be installed by pip. Test Plan: Delete local s3cmd (i.e. run brew uninstall s3cmd) -> run install_python_requirements -> try to backup encrypted at rest universe. Also tested this on a k8s YW leftover from itest run by running ``` pip install s3cmd ``` and rerunning backup on encrypted at rest universe and making sure it works. Reviewers: sanketh, arnav, wesley, bogdan Reviewed By: bogdan Differential Revision: https://phabricator.dev.yugabyte.com/D9315
1 parent c00828c commit 8af029e

File tree

3 files changed

+4
-1
lines changed

3 files changed

+4
-1
lines changed

managed/devops/bin/yb_backup.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -397,7 +397,8 @@ def storage_type():
397397
def _command_list_prefix(self):
398398
# If 's3cmd get' fails it creates zero-length file, '--force' is needed to
399399
# override this empty file on the next retry-step.
400-
return ['s3cmd', '--force', '--config=%s' % self.options.cloud_cfg_file_path]
400+
return ['s3cmd', '--force', '--no-check-certificate', '--config=%s'
401+
% self.options.cloud_cfg_file_path]
401402

402403
def upload_file_cmd(self, src, dest):
403404
cmd_list = ["put", src, dest]

managed/devops/python_requirements.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ pycrypto
4545
python-dateutil==2.5.3
4646
python-dotenv==0.6.4
4747
PyYAML==3.13
48+
s3cmd==2.0.2
4849
setuptools>=11.333
4950
six==1.10.0
5051
slackclient

managed/devops/python_requirements_frozen.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ s3transfer==0.1.13
7575
six==1.10.0
7676
slackclient==1.3.2
7777
stormssh==0.7.0
78+
s3cmd==2.0.2
7879
termcolor==1.1.0
7980
texttable==1.6.2
8081
typing==3.7.4.3

0 commit comments

Comments
 (0)