]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
CrushWrapper: pick a ruleset same as rule_id 2775/head
authorXiaoxi Chen <xiaoxi.chen@intel.com>
Wed, 20 Aug 2014 07:35:44 +0000 (15:35 +0800)
committerJoao Eduardo Luis <jecluis@gmail.com>
Tue, 21 Oct 2014 20:32:46 +0000 (21:32 +0100)
commit309c74d847f88f906b42bbd12af6c79cc59e645b
tree9e345eb520375bd6f2e015b319ed996365afea4a
parent06a62dbb552981f86e58d83c58eeb254d633e74a
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/crush/CrushWrapper.cc
src/crush/crush.h
src/test/erasure-code/TestErasureCodeIsa.cc
src/test/erasure-code/TestErasureCodeJerasure.cc
src/test/mon/osd-crush.sh

Fixes: #9675
src/crush/CrushWrapper.cc
src/crush/CrushWrapper.h