]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
CrushWrapper: pick a ruleset same as rule_id 2776/head
authorXiaoxi Chen <xiaoxi.chen@intel.com>
Wed, 20 Aug 2014 07:35:44 +0000 (15:35 +0800)
committerJoao Eduardo Luis <jecluis@gmail.com>
Wed, 22 Oct 2014 16:30:56 +0000 (17:30 +0100)
commitb9450b532ab7ad23ec6e2c22ed7cf55e6e1cc4c0
treebf578e5cd12715782887c2e1e9ef7c5cfd77685f
parent0975ec9cec1c466f7b15f5173541a7eab02dae18
CrushWrapper: pick a ruleset same as rule_id

Originally in the add_simple_ruleset funtion, the ruleset_id
is not reused but rule_id is reused. So after some add/remove
against rules, the newly created rule likely to have
ruleset!=rule_id.

We dont want this happen because we are trying to hold the constraint
that ruleset == rule_id.

Signed-off-by: Xiaoxi Chen <xiaoxi.chen@intel.com>
(cherry picked from commit 78e84f34da83abf5a62ae97bb84ab70774b164a6)

Conflicts:
src/test/erasure-code/TestErasureCodeIsa.cc

Fixes: #9675
src/crush/CrushWrapper.cc
src/crush/CrushWrapper.h
src/crush/builder.c
src/crush/crush.h
src/test/erasure-code/TestErasureCodeJerasure.cc
src/test/mon/osd-crush.sh