[6.0] 14fad5a0c shard signedness stir: last bits?
Reza Naghibi
reza at naghibi.com
Wed Aug 19 13:17:08 UTC 2020
commit 14fad5a0c2942f74b261b5cd6f2f4e31041c6b1f
Author: Nils Goroll <nils.goroll at uplex.de>
Date: Wed Jun 10 09:52:06 2020 +0200
shard signedness stir: last bits?
Conflicts:
lib/libvmod_directors/vmod_shard.c
diff --git a/lib/libvmod_directors/shard_dir.c b/lib/libvmod_directors/shard_dir.c
index f2c3db8dd..93ac0fa07 100644
--- a/lib/libvmod_directors/shard_dir.c
+++ b/lib/libvmod_directors/shard_dir.c
@@ -308,9 +308,8 @@ unsigned
sharddir_any_healthy(struct sharddir *shardd, const struct busyobj *bo,
double *changed)
{
- unsigned retval = 0;
+ unsigned i, retval = 0;
VCL_BACKEND be;
- int i;
vtim_real c;
CHECK_OBJ_NOTNULL(shardd, SHARDDIR_MAGIC);
@@ -399,10 +398,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);
More information about the varnish-commit
mailing list