From f0cd589a75a4e5c211b94a1e32aab8d90df32bc3 Mon Sep 17 00:00:00 2001 From: Amos Kong Date: Fri, 21 Jun 2019 23:02:13 +0000 Subject: [PATCH] dist: suppress the yaml load warning YAMLLoadWarning: calling yaml.load() without Loader=... is deprecated, as the default Loader is unsafe. Please read https://msg.pyyaml.org/load for full details. Fix it by use new safe interface - yaml.safe_load() Signed-off-by: Amos Kong Cc: Vlad Zolotarov Message-Id: <9b68601845117274573474ede0341cc81f80efa6.1561156205.git.amos@scylladb.com> --- dist/common/scripts/scylla_blocktune.py | 2 +- dist/common/scripts/scylla_config_get.py | 2 +- dist/common/scripts/scylla_fstrim | 2 +- dist/common/scripts/scylla_io_setup | 2 +- dist/common/scripts/scylla_util.py | 2 +- dist/docker/redhat/scyllasetup.py | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dist/common/scripts/scylla_blocktune.py b/dist/common/scripts/scylla_blocktune.py index 15f248f9e8..53c34cbb68 100644 --- a/dist/common/scripts/scylla_blocktune.py +++ b/dist/common/scripts/scylla_blocktune.py @@ -95,7 +95,7 @@ def tune_fs(path, nomerges): # tunes all filesystems referenced from a scylla.yaml def tune_yaml(path, nomerges): import yaml - y = yaml.load(open(path)) + y = yaml.safe_load(open(path)) for fs in y['data_file_directories']: tune_fs(fs, nomerges) tune_fs(y['commitlog_directory'], nomerges) diff --git a/dist/common/scripts/scylla_config_get.py b/dist/common/scripts/scylla_config_get.py index 336bf3022f..dd3031a649 100755 --- a/dist/common/scripts/scylla_config_get.py +++ b/dist/common/scripts/scylla_config_get.py @@ -27,7 +27,7 @@ import yaml def get(config, key): s = open(config).read() - cfg = yaml.load(s) + cfg = yaml.safe_load(s) try: val = cfg[key] except KeyError: diff --git a/dist/common/scripts/scylla_fstrim b/dist/common/scripts/scylla_fstrim index 9f0e3e3a4a..7b168844df 100755 --- a/dist/common/scripts/scylla_fstrim +++ b/dist/common/scripts/scylla_fstrim @@ -39,7 +39,7 @@ def main(): help='path to scylla.yaml') args = parser.parse_args() s = open(args.config).read() - cfg = yaml.load(s) + cfg = yaml.safe_load(s) mountpoints = set() for d in cfg['data_file_directories']: mountpoints.add(find_mount_point(d)) diff --git a/dist/common/scripts/scylla_io_setup b/dist/common/scripts/scylla_io_setup index f9d04d242d..250b216df2 100755 --- a/dist/common/scripts/scylla_io_setup +++ b/dist/common/scripts/scylla_io_setup @@ -90,7 +90,7 @@ if __name__ == "__main__": conf_dir = os.environ["SCYLLA_CONF"] else: conf_dir = "/etc/scylla" - cfg = yaml.load(open(os.path.join(conf_dir, "scylla.yaml"))) + cfg = yaml.safe_load(open(os.path.join(conf_dir, "scylla.yaml"))) if not "data_file_directories" in cfg: logging.error("No data directories found. Please check the configuration and run scylla_io_setup again.\n") sys.exit(1) diff --git a/dist/common/scripts/scylla_util.py b/dist/common/scripts/scylla_util.py index 445010cde7..994041792e 100644 --- a/dist/common/scripts/scylla_util.py +++ b/dist/common/scripts/scylla_util.py @@ -420,7 +420,7 @@ def get_scylla_dirs(): Verifies that mandatory parameters are set. """ scylla_yaml_name = '/etc/scylla/scylla.yaml' - y = yaml.load(open(scylla_yaml_name)) + y = yaml.safe_load(open(scylla_yaml_name)) # Check that mandatory fields are set if 'data_file_directories' not in y or \ diff --git a/dist/docker/redhat/scyllasetup.py b/dist/docker/redhat/scyllasetup.py index 1cbee44aa7..20a1e05a02 100644 --- a/dist/docker/redhat/scyllasetup.py +++ b/dist/docker/redhat/scyllasetup.py @@ -39,7 +39,7 @@ class ScyllaSetup: def io(self): conf_dir = "/etc/scylla" - cfg = yaml.load(open(os.path.join(conf_dir, "scylla.yaml"))) + cfg = yaml.safe_load(open(os.path.join(conf_dir, "scylla.yaml"))) data_dirs = cfg["data_file_directories"] if len(data_dirs) > 1: logging.warn("%d data directories found. scylla_io_setup currently lacks support for it, and only %s will be evaluated",