Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
* [BUGFIX] No-longer-needed ingester operations for queries triggered by queriers and rulers are now canceled. #3178
* [BUGFIX] Ruler: directories in the configured `rules-path` will be removed on startup and shutdown in order to ensure they don't persist between runs. #3195
* [BUGFIX] Handle hash-collisions in the query path. #3192
* [BUGFIX] Check for postgres rows errors. #3197

## 1.4.0-rc.0 in progress

Expand Down
14 changes: 14 additions & 0 deletions pkg/configs/db/postgres/postgres.go
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,13 @@ func (d DB) findConfigs(filter squirrel.Sqlizer) (map[string]userconfig.View, er
cfg.DeletedAt = deletedAt.Time
cfgs[userID] = cfg
}

// Check for any errors encountered.
err = rows.Err()
if err != nil {
return nil, err
}

return cfgs, nil
}

Expand Down Expand Up @@ -272,6 +279,13 @@ func (d DB) findRulesConfigs(filter squirrel.Sqlizer) (map[string]userconfig.Ver
cfg.DeletedAt = deletedAt.Time
cfgs[userID] = cfg
}

// Check for any errors encountered.
err = rows.Err()
if err != nil {
return nil, err
}

return cfgs, nil
}

Expand Down