From 5ee11261f49dbfba43c75ee6b9fe3a282c636d55 Mon Sep 17 00:00:00 2001 From: Seena Fallah Date: Fri, 11 Dec 2020 19:38:06 +0330 Subject: [PATCH 1/2] cluster/ceph: Use crush_rule instead of crush_ruleset crush_ruleset is deprecated and replaced with crush_rule Signed-off-by: Seena Fallah --- cluster/ceph.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cluster/ceph.py b/cluster/ceph.py index f0aea803..d651b7b7 100644 --- a/cluster/ceph.py +++ b/cluster/ceph.py @@ -763,7 +763,7 @@ def mkpool(self, name, profile_name, application, base_name=None): ruleset = crush_profile except ValueError: ruleset = self.get_ruleset(crush_profile) - common.pdsh(settings.getnodes('head'), 'sudo %s -c %s osd pool set %s crush_ruleset %s' % (self.ceph_cmd, self.tmp_conf, name, crush_profile), + common.pdsh(settings.getnodes('head'), 'sudo %s -c %s osd pool set %s crush_rule %s' % (self.ceph_cmd, self.tmp_conf, name, crush_profile), continue_if_error=False).communicate() logger.info('Checking Health after pool creation.') From 55643b93840b997e774ae96fb318923de2c9046e Mon Sep 17 00:00:00 2001 From: Seena Fallah Date: Fri, 11 Dec 2020 19:50:22 +0330 Subject: [PATCH 2/2] cluster/ceph: revoke crush_profile index based Ceph doesn't support pool crush_rule based on indexes Signed-off-by: Seena Fallah --- cluster/ceph.py | 7 ------- example/example-kvmrbdfio.yaml | 2 +- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/cluster/ceph.py b/cluster/ceph.py index d651b7b7..eba58ff9 100644 --- a/cluster/ceph.py +++ b/cluster/ceph.py @@ -756,13 +756,6 @@ def mkpool(self, name, profile_name, application, base_name=None): continue_if_error=False).communicate() if crush_profile: - try: - rule_index = int(crush_profile) - # set crush profile using the integer 0-based index of crush rule - # displayed by: ceph osd crush rule ls - ruleset = crush_profile - except ValueError: - ruleset = self.get_ruleset(crush_profile) common.pdsh(settings.getnodes('head'), 'sudo %s -c %s osd pool set %s crush_rule %s' % (self.ceph_cmd, self.tmp_conf, name, crush_profile), continue_if_error=False).communicate() diff --git a/example/example-kvmrbdfio.yaml b/example/example-kvmrbdfio.yaml index f09ce0ce..aa9445b6 100644 --- a/example/example-kvmrbdfio.yaml +++ b/example/example-kvmrbdfio.yaml @@ -21,7 +21,7 @@ cluster: pg_size: 64 pgp_size: 64 replication: 3 - crush_profile: 1 + crush_profile: replicated_rule benchmarks: kvmrbdfio: fio_cmd: /usr/local/bin/fio