Correct some error handlings (#8000)

fix #7954 Signed-off-by: seiya <[email protected]>
grafana · Apr 29, 2024 · f469726 · f469726
1 parent 8cbe5b1
commit f469726
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/pkg/alertmanager/alertmanager.go b/pkg/alertmanager/alertmanager.go
@@ -369,7 +369,7 @@ func (am *Alertmanager) ApplyConfig(userID string, conf *config.Config, rawCfg s
 		return notifier
 	})
 	if err != nil {
-		return nil
+		return err
 	}
 
 	timeIntervals := make(map[string][]timeinterval.TimeInterval, len(conf.MuteTimeIntervals)+len(conf.TimeIntervals))

diff --git a/pkg/ruler/remotequerier.go b/pkg/ruler/remotequerier.go
@@ -222,7 +222,7 @@ func (q *RemoteQuerier) Query(ctx context.Context, qs string, t time.Time) (prom
 func (q *RemoteQuerier) query(ctx context.Context, query string, ts time.Time, logger log.Logger) (promql.Vector, error) {
 	req, err := q.createRequest(ctx, query, ts)
 	if err != nil {
-		return promql.Vector{}, nil
+		return promql.Vector{}, err
 	}
 
 	ctx, cancel := context.WithTimeout(ctx, q.timeout)

diff --git a/pkg/storage/tsdb/block/block_generator.go b/pkg/storage/tsdb/block/block_generator.go
@@ -123,7 +123,7 @@ func GenerateBlockFromSpec(storageDir string, specs SeriesSpecs) (_ *Meta, retur
 
 	chunkwClosed = true
 	if err := chunkw.Close(); err != nil {
-		return nil, nil
+		return nil, err
 	}
 
 	// Write index.