Make the final sleep configurable, and set it to 0 in tests, so they don't timeout.

Signed-off-by: Tom Wilkie <[email protected]>

Author: tomwilkie

pkg/ingester/lifecycle_test.go

@@ -40,6 +40,7 @@ func defaultIngesterTestConfig() Config {
 	cfg.LifecyclerConfig.ListenPort = func(i int) *int { return &i }(0)
 	cfg.LifecyclerConfig.Addr = "localhost"
 	cfg.LifecyclerConfig.ID = "localhost"
+	cfg.LifecyclerConfig.FinalSleep = 0
 	return cfg
 }
 

pkg/ring/lifecycler.go

@@ -50,6 +50,7 @@ type LifecyclerConfig struct {
 	ClaimOnRollout   bool          `yaml:"claim_on_rollout,omitempty"`
 	NormaliseTokens  bool          `yaml:"normalise_tokens,omitempty"`
 	InfNames         []string      `yaml:"interface_names"`
+	FinalSleep       time.Duration `yaml:"final_sleep"`
 
 	// For testing, you can override the address and ID of this ingester
 	Addr           string `yaml:"address"`
@@ -68,6 +69,7 @@ func (cfg *LifecyclerConfig) RegisterFlags(f *flag.FlagSet) {
 	f.DurationVar(&cfg.MinReadyDuration, "ingester.min-ready-duration", 1*time.Minute, "Minimum duration to wait before becoming ready. This is to work around race conditions with ingesters exiting and updating the ring.")
 	f.BoolVar(&cfg.ClaimOnRollout, "ingester.claim-on-rollout", false, "Send chunks to PENDING ingesters on exit.")
 	f.BoolVar(&cfg.NormaliseTokens, "ingester.normalise-tokens", false, "Store tokens in a normalised fashion to reduce allocations.")
+	f.DurationVar(&cfg.FinalSleep, "ingester.final-sleep", 30*time.Second, "Duration to sleep for before exiting, to ensure metrics are scraped.")
 
 	hostname, err := os.Hostname()
 	if err != nil {
@@ -467,8 +469,8 @@ func (i *Lifecycler) processShutdown(ctx context.Context) {
 		shutdownDuration.WithLabelValues("flush", "success").Observe(time.Since(flushStart).Seconds())
 	}
 
-	// Sleep for 2 scrape intervals, so the shutdownDuration metric can be collected.
-	time.Sleep(30 * time.Second)
+	// Sleep so the shutdownDuration metric can be collected.
+	time.Sleep(i.cfg.FinalSleep)
 }
 
 // unregister removes our entry from consul.

pkg/ring/lifecycler_test.go

@@ -42,6 +42,7 @@ func TestRingNormaliseMigration(t *testing.T) {
 	lifecyclerConfig1.NumTokens = 1
 	lifecyclerConfig1.ClaimOnRollout = true
 	lifecyclerConfig1.ID = "ing1"
+	lifecyclerConfig1.FinalSleep = 0
 
 	ft := &flushTransferer{}
 	l1, err := NewLifecycler(lifecyclerConfig1, ft)
@@ -67,6 +68,7 @@ func TestRingNormaliseMigration(t *testing.T) {
 	lifecyclerConfig2.JoinAfter = 100 * time.Second
 	lifecyclerConfig2.NormaliseTokens = true
 	lifecyclerConfig2.ID = "ing2"
+	lifecyclerConfig1.FinalSleep = 0
 
 	l2, err := NewLifecycler(lifecyclerConfig2, &flushTransferer{})
 	require.NoError(t, err)