[master] 3c0609bc8 shard signedness stir: last bits?

Nils Goroll nils.goroll at uplex.de
Wed Jun 10 07:53:06 UTC 2020


commit 3c0609bc8c5a66beb6ada598e7ba60b62940f242
Author: Nils Goroll <nils.goroll at uplex.de>
Date:   Wed Jun 10 09:52:06 2020 +0200

    shard signedness stir: last bits?

diff --git a/lib/libvmod_directors/shard_dir.c b/lib/libvmod_directors/shard_dir.c
index b82364297..ea3dafad3 100644
--- a/lib/libvmod_directors/shard_dir.c
+++ b/lib/libvmod_directors/shard_dir.c
@@ -276,9 +276,8 @@ init_state(struct shard_state *state,
 VCL_BOOL
 sharddir_any_healthy(VRT_CTX, struct sharddir *shardd, VCL_TIME *changed)
 {
-	unsigned retval = 0;
+	unsigned i, retval = 0;
 	VCL_BACKEND be;
-	int i;
 	vtim_real c;
 
 	CHECK_OBJ_NOTNULL(shardd, SHARDDIR_MAGIC);
@@ -367,10 +366,10 @@ sharddir_pick_be_locked(VRT_CTX, const struct sharddir *shardd, uint32_t key,
 	chosen_r = shardcfg_get_rampup(shardd, state->previous.hostid);
 	alt_r = shardcfg_get_rampup(shardd, state->last.hostid);
 
-	SHDBG(SHDBG_RAMPWARM, shardd, "chosen host %d rampup %f changed %f",
+	SHDBG(SHDBG_RAMPWARM, shardd, "chosen host %u rampup %f changed %f",
 	    state->previous.hostid, chosen_r,
 	    ctx->now - state->previous.changed);
-	SHDBG(SHDBG_RAMPWARM, shardd, "alt host %d rampup %f changed %f",
+	SHDBG(SHDBG_RAMPWARM, shardd, "alt host %u rampup %f changed %f",
 	    state->last.hostid, alt_r,
 	    ctx->now - state->last.changed);
 
diff --git a/lib/libvmod_directors/vmod_shard.c b/lib/libvmod_directors/vmod_shard.c
index 156479eb2..d634f0785 100644
--- a/lib/libvmod_directors/vmod_shard.c
+++ b/lib/libvmod_directors/vmod_shard.c
@@ -800,10 +800,10 @@ vmod_shard_list(VRT_CTX, VCL_BACKEND dir, struct vsb *vsb, int pflag, int jflag)
 		return;
 
 	if (jflag)
-		VSB_printf(vsb, "[%u, %d, \"%s\"]", nh, i,
+		VSB_printf(vsb, "[%u, %u, \"%s\"]", nh, i,
 		    nh ? "healthy" : "sick");
 	else
-		VSB_printf(vsb, "%u/%d\t%s", nh, i, nh ? "healthy" : "sick");
+		VSB_printf(vsb, "%u/%u\t%s", nh, i, nh ? "healthy" : "sick");
 }
 
 VCL_VOID v_matchproto_(td_directors_shard_backend)


More information about the varnish-commit mailing list