From 6acfa6d638e4c83c1263e947378679e61c6dfb55 Mon Sep 17 00:00:00 2001 From: Loic Dachary Date: Sun, 16 Mar 2014 18:05:42 +0100 Subject: [PATCH] ceph_manager: update ec_pool creation parameters As of https://github.com/ceph/ceph/pull/1477 the erasure code parameters are controled via the osd erasure-code-profile set command instead of being inlined and duplicated in the crush ruleset creation and the pool creation. There is no need to create the crush ruleset, it is done implicitly. Signed-off-by: Loic Dachary --- teuthology/ceph.conf.template | 2 +- teuthology/task/ceph_manager.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/teuthology/ceph.conf.template b/teuthology/ceph.conf.template index ee8050edf3..4a02e8e9ff 100644 --- a/teuthology/ceph.conf.template +++ b/teuthology/ceph.conf.template @@ -18,7 +18,7 @@ mon osd allow primary affinity = true - osd pool default erasure code properties = "erasure-code-plugin=jerasure erasure-code-technique=reed_sol_van erasure-code-k=2 erasure-code-m=1 erasure-code-ruleset-failure-domain=osd" + osd pool default erasure code profile = "plugin=jerasure technique=reed_sol_van k=2 m=1 ruleset-failure-domain=osd" [osd] osd journal size = 100 diff --git a/teuthology/task/ceph_manager.py b/teuthology/task/ceph_manager.py index 82dbc1343d..992d8712d3 100644 --- a/teuthology/task/ceph_manager.py +++ b/teuthology/task/ceph_manager.py @@ -705,10 +705,10 @@ class CephManager: self.log("creating pool_name %s"%(pool_name,)) if ec_pool and not self.created_erasure_pool: self.created_erasure_pool = True - self.raw_cluster_cmd('osd', 'crush', 'rule', 'create-erasure', 'erasure2', 'erasure-code-ruleset-failure-domain=osd', 'erasure-code-m=1', 'erasure-code-k=2') + self.raw_cluster_cmd('osd', 'erasure-code-profile', 'set', 'teuthologyprofile', 'ruleset-failure-domain=osd', 'm=1', 'k=2') if ec_pool: - self.raw_cluster_cmd('osd', 'pool', 'create', pool_name, str(pg_num), str(pg_num), 'erasure', 'crush_ruleset=erasure2', 'erasure-code-m=1', 'erasure-code-k=2') + self.raw_cluster_cmd('osd', 'pool', 'create', pool_name, str(pg_num), str(pg_num), 'erasure', 'teuthologyprofile') else: self.raw_cluster_cmd('osd', 'pool', 'create', pool_name, str(pg_num)) self.pools[pool_name] = pg_num -- 2.39.5