Improve consistency check warn log (#6366)

SungJin1212 · web-flow · commit 24efa2bc291c · 2024-11-24T10:22:39.000-08:00
diff --git a/pkg/querier/blocks_store_queryable.go b/pkg/querier/blocks_store_queryable.go
@@ -596,8 +596,9 @@ func (q *blocksStoreQuerier) queryWithConsistencyCheck(ctx context.Context, logg
 	}
 
 	// We've not been able to query all expected blocks after all retries.
+	err = fmt.Errorf("consistency check failed because some blocks were not queried: %s", strings.Join(convertULIDsToString(remainingBlocks), " "))
 	level.Warn(util_log.WithContext(ctx, logger)).Log("msg", "failed consistency check", "err", err)
-	return fmt.Errorf("consistency check failed because some blocks were not queried: %s", strings.Join(convertULIDsToString(remainingBlocks), " "))
+	return err
 }
 
 func (q *blocksStoreQuerier) fetchSeriesFromStores(

Original file line number	Diff line number	Diff line change
`@@ -596,8 +596,9 @@ func (q *blocksStoreQuerier) queryWithConsistencyCheck(ctx context.Context, logg`
`596`	`596`	`}`
`597`	`597`
`598`	`598`	`// We've not been able to query all expected blocks after all retries.`
	`599`	`+ err = fmt.Errorf("consistency check failed because some blocks were not queried: %s", strings.Join(convertULIDsToString(remainingBlocks), " "))`
`599`	`600`	`level.Warn(util_log.WithContext(ctx, logger)).Log("msg", "failed consistency check", "err", err)`
`600`		`- return fmt.Errorf("consistency check failed because some blocks were not queried: %s", strings.Join(convertULIDsToString(remainingBlocks), " "))`
	`601`	`+ return err`
`601`	`602`	`}`
`602`	`603`
`603`	`604`	`func (q *blocksStoreQuerier) fetchSeriesFromStores(`