Fix API breakage

Signed-off-by: Goutham Veeramachaneni <gouthamve@gmail.com>
grafana · Mar 12, 2019 · 9330f31 · 9330f31
1 parent c35facb
commit 9330f31
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/pkg/ingester/flush.go b/pkg/ingester/flush.go
@@ -204,7 +204,7 @@ func (i *Ingester) removeFlushedChunks(instance *instance, stream *stream) {
 
 	if len(stream.chunks) == 0 {
 		delete(instance.streams, stream.fp)
-		instance.index.Delete(stream.labels, stream.fp)
+		instance.index.Delete(client.FromLabelPairsToLabels(stream.labels), stream.fp)
 		instance.streamsRemovedTotal.Inc()
 	}
 }

diff --git a/pkg/ingester/ingester.go b/pkg/ingester/ingester.go
@@ -196,7 +196,7 @@ func (*Ingester) Watch(*grpc_health_v1.HealthCheckRequest, grpc_health_v1.Health
 // the addition removal of another ingester. Returns 204 when the ingester is
 // ready, 500 otherwise.
 func (i *Ingester) ReadinessHandler(w http.ResponseWriter, r *http.Request) {
-	if i.lifecycler.IsReady(r.Context()) {
+	if err := i.lifecycler.CheckReady(r.Context()); err == nil {
 		w.WriteHeader(http.StatusNoContent)
 	} else {
 		w.WriteHeader(http.StatusInternalServerError)