Stop module after smokes (#7909)

cmd/mimir-continuous-test/main.go

@@ -4,13 +4,15 @@ package main
 
 import (
 	"context"
+	"errors"
 	"flag"
 	"fmt"
 	"os"
 
 	"github.com/go-kit/log/level"
 	"github.com/grafana/dskit/flagext"
 	"github.com/grafana/dskit/log"
+	"github.com/grafana/dskit/modules"
 	"github.com/grafana/dskit/tracing"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/collectors"
@@ -74,8 +76,11 @@ func main() {
 	m := continuoustest.NewManager(cfg.Manager, logger)
 	m.AddTest(continuoustest.NewWriteReadSeriesTest(cfg.WriteReadSeriesTest, client, logger, registry))
 	if err := m.Run(context.Background()); err != nil {
-		level.Error(logger).Log("msg", "Failed to run continuous test", "err", err.Error())
+		if !errors.Is(err, modules.ErrStopProcess) {
+			level.Error(logger).Log("msg", "Failed to run continuous test", "err", err.Error())
+			util_log.Flush()
+			os.Exit(1)
+		}
 		util_log.Flush()
-		os.Exit(1)
 	}
 }

pkg/continuoustest/manager.go

@@ -9,6 +9,7 @@ import (
 
 	"github.com/go-kit/log"
 	"github.com/go-kit/log/level"
+	"github.com/grafana/dskit/modules"
 	"golang.org/x/sync/errgroup"
 )
 
@@ -92,5 +93,9 @@ func (m *Manager) Run(ctx context.Context) error {
 		})
 	}
 
-	return group.Wait()
+	err := group.Wait()
+	if err == nil && m.cfg.SmokeTest {
+		err = modules.ErrStopProcess
+	}
+	return err
 }

pkg/continuoustest/manager_test.go

@@ -9,6 +9,7 @@ import (
 	"time"
 
 	"github.com/go-kit/log"
+	"github.com/grafana/dskit/modules"
 	"github.com/pkg/errors"
 	"github.com/stretchr/testify/require"
 )
@@ -72,7 +73,7 @@ func TestManager_SmokeTest(t *testing.T) {
 		defer cancel()
 		err := manager.Run(ctx)
 
-		require.NoError(t, err)
+		require.EqualError(t, err, modules.ErrStopProcess.Error())
 		require.Equal(t, dummyTest.runs, 1)
 	})
 

pkg/mimir/mimir.go

@@ -820,6 +820,7 @@ func (t *Mimir) setupObjstoreTracing() {
 // Run starts Mimir running, and blocks until a Mimir stops.
 func (t *Mimir) Run() error {
 	mimirpb.TimeseriesUnmarshalCachingEnabled = t.Cfg.TimeseriesUnmarshalCachingOptimizationEnabled
+	defer util_log.Flush()
 
 	// Register custom process metrics.
 	if c, err := process.NewProcessCollector(); err == nil {