From: Sage Weil Date: Tue, 6 May 2014 00:05:10 +0000 (-0700) Subject: ceph_manager: reset osd weights to 1 when waiting for clean X-Git-Tag: v0.94.10~27^2^2~364^2~204^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=33b4bfc764a2907a8af5268b3af199a3ca212e09;p=ceph.git ceph_manager: reset osd weights to 1 when waiting for clean If we leave the weights adjusted, we can get PGs stuck in a remapped state because we are probabilistically rejecting placement. Avoid this by setting on in osds to 1.0 before waiting for clean. Signed-off-by: Sage Weil --- diff --git a/teuthology/task/ceph_manager.py b/teuthology/task/ceph_manager.py index 0ead9d08f98..046ed644b59 100644 --- a/teuthology/task/ceph_manager.py +++ b/teuthology/task/ceph_manager.py @@ -374,6 +374,9 @@ class Thrasher: if random.uniform(0, 1) < (float(delay) / cleanint): while len(self.dead_osds) > maxdead: self.revive_osd() + for osd in self.in_osds: + self.ceph_manager.raw_cluster_cmd('osd', 'reweight', + str(osd), str(1)) if random.uniform(0, 1) < float( self.config.get('chance_test_map_discontinuity', 0)): self.test_map_discontinuity()