added a readiness probe

Signed-off-by: Yash Sharma <yashrsharma44@gmail.com>
thanos-io · Mar 2, 2021 · 21a645b · 21a645b
1 parent 4361243
commit 21a645b
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 26 deletions.
diff --git a/cmd/thanos/receive.go b/cmd/thanos/receive.go
@@ -194,19 +194,22 @@ func runReceive(
 	}
 
 	level.Debug(logger).Log("msg", "setting up http server")
-	srv := httpserver.New(logger, reg, comp, httpProbe,
-		httpserver.WithListen(httpBindAddr),
-		httpserver.WithGracePeriod(httpGracePeriod),
-	)
-	g.Add(func() error {
-		statusProber.Healthy()
-		err := srv.ListenAndServe()
-		return err
-	}, func(err error) {
-		statusProber.NotReady(err)
-		defer statusProber.NotHealthy(err)
-		srv.Shutdown(err)
-	})
+	{
+		srv := httpserver.New(logger, reg, comp, httpProbe,
+			httpserver.WithListen(httpBindAddr),
+			httpserver.WithGracePeriod(httpGracePeriod),
+		)
+		g.Add(func() error {
+			statusProber.Healthy()
+			err := srv.ListenAndServe()
+			return err
+		}, func(err error) {
+			statusProber.NotReady(err)
+			defer statusProber.NotHealthy(err)
+			srv.Shutdown(err)
+		})
+
+	}
 
 	level.Debug(logger).Log("msg", "setting up grpc server")
 	{

diff --git a/cmd/thanos/receive_route.go b/cmd/thanos/receive_route.go
@@ -187,21 +187,23 @@ func runReceiveRoute(
 	}
 
 	level.Debug(logger).Log("msg", "setting up http server")
-	srv := httpserver.New(logger, reg, comp, httpProbe,
-		httpserver.WithListen(httpBindAddr),
-		httpserver.WithGracePeriod(httpGracePeriod),
-	)
-	g.Add(func() error {
-		statusProber.Healthy()
-
-		return srv.ListenAndServe()
-	}, func(err error) {
-		statusProber.NotReady(err)
-		defer statusProber.NotHealthy(err)
+	{
+		srv := httpserver.New(logger, reg, comp, httpProbe,
+			httpserver.WithListen(httpBindAddr),
+			httpserver.WithGracePeriod(httpGracePeriod),
+		)
+		g.Add(func() error {
+			statusProber.Ready()
+			defer statusProber.Healthy()
 
-		srv.Shutdown(err)
-	})
+			return srv.ListenAndServe()
+		}, func(err error) {
+			statusProber.NotReady(err)
+			defer statusProber.NotHealthy(err)
 
+			srv.Shutdown(err)
+		})
+	}
 	level.Debug(logger).Log("msg", "setting up receive http handler")
 	{
 		g.Add(