Rolled back controversial change to IngesterDesc.IsHealthy() which will require a dedicated discussion

pracucci · pracucci · commit 6e4635ad15cb · 2019-12-02T10:24:11.000+01:00
Signed-off-by: Marco Pracucci &lt;marco@pracucci.com&gt;
diff --git a/pkg/ring/model.go b/pkg/ring/model.go
@@ -184,7 +184,7 @@ func (d *Desc) TokensFor(id string) (tokens, other []uint32) {
 func (i *IngesterDesc) IsHealthy(op Operation, heartbeatTimeout time.Duration) bool {
 	if op == Write && i.State != ACTIVE {
 		return false
-	} else if op == Read && i.State != ACTIVE && i.State != LEAVING {
+	} else if op == Read && i.State == JOINING {
 		return false
 	}
 	return time.Now().Sub(time.Unix(i.Timestamp, 0)) <= heartbeatTimeout

Original file line number	Diff line number	Diff line change
`@@ -184,7 +184,7 @@ func (d *Desc) TokensFor(id string) (tokens, other []uint32) {`
`184`	`184`	`func (i *IngesterDesc) IsHealthy(op Operation, heartbeatTimeout time.Duration) bool {`
`185`	`185`	`if op == Write && i.State != ACTIVE {`
`186`	`186`	`return false`
`187`		`- } else if op == Read && i.State != ACTIVE && i.State != LEAVING {`
	`187`	`+ } else if op == Read && i.State == JOINING {`
`188`	`188`	`return false`
`189`	`189`	`}`
`190`	`190`	`return time.Now().Sub(time.Unix(i.Timestamp, 0)) <= heartbeatTimeout`