Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b9b519b7 authored by Ilya Dryomov's avatar Ilya Dryomov
Browse files

crush: decode and initialize chooseleaf_stable 



Also add missing \n while at it.

Signed-off-by: default avatarIlya Dryomov <idryomov@gmail.com>
Reviewed-by: default avatarSage Weil <sage@redhat.com>
parent dc6ae6d8

net/ceph/osdmap.c

+14 −5
Original line number Diff line number Diff line
@@ -342,23 +342,32 @@ static struct crush_map *crush_decode(void *pbyval, void *end) 
        c->choose_local_tries = ceph_decode_32(p);

        c->choose_local_fallback_tries =  ceph_decode_32(p);

        c->choose_total_tries = ceph_decode_32(p);

        dout("crush decode tunable choose_local_tries = %d",

        dout("crush decode tunable choose_local_tries = %d\n",

             c->choose_local_tries);

        dout("crush decode tunable choose_local_fallback_tries = %d",

        dout("crush decode tunable choose_local_fallback_tries = %d\n",

             c->choose_local_fallback_tries);

        dout("crush decode tunable choose_total_tries = %d",

        dout("crush decode tunable choose_total_tries = %d\n",

             c->choose_total_tries);



	ceph_decode_need(p, end, sizeof(u32), done);

	c->chooseleaf_descend_once = ceph_decode_32(p);

	dout("crush decode tunable chooseleaf_descend_once = %d",

	dout("crush decode tunable chooseleaf_descend_once = %d\n",

	     c->chooseleaf_descend_once);



	ceph_decode_need(p, end, sizeof(u8), done);

	c->chooseleaf_vary_r = ceph_decode_8(p);

	dout("crush decode tunable chooseleaf_vary_r = %d",

	dout("crush decode tunable chooseleaf_vary_r = %d\n",

	     c->chooseleaf_vary_r);



	/* skip straw_calc_version, allowed_bucket_algs */

	ceph_decode_need(p, end, sizeof(u8) + sizeof(u32), done);

	*p += sizeof(u8) + sizeof(u32);



	ceph_decode_need(p, end, sizeof(u8), done);

	c->chooseleaf_stable = ceph_decode_8(p);

	dout("crush decode tunable chooseleaf_stable = %d\n",

	     c->chooseleaf_stable);



done:

	dout("crush_decode success\n");

	return c;