From: Ilya Dryomov Date: Tue, 24 Dec 2013 19:19:26 +0000 (+0200) Subject: crush: generalize descend_once X-Git-Tag: v3.14-rc1~71^2~35 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d390bb2a83086f2b79c152e2c1734813bd257d9b;p=pandora-kernel.git crush: generalize descend_once The legacy behavior is to make the normal number of tries for the recursive chooseleaf call. The descend_once tunable changed this to making a single try and bail if we get a reject (note that it is impossible to collide in the recursive case). The new set_chooseleaf_tries lets you select the number of recursive chooseleaf attempts for indep mode, or default to 1. Use the same behavior for firstn, except default to total_tries when the legacy tunables are set (for compatibility). This makes the rule step override the (new) default of 1 recursive attempt, keeping behavior consistent with indep mode. Reflects ceph.git commit 685c6950ef3df325ef04ce7c986e36ca2514c5f1. Signed-off-by: Ilya Dryomov Reviewed-by: Sage Weil --- Reading git-diff-tree failed