From 71cd6c4f3455ee163363eebc2f0c82dc503a83a9 Mon Sep 17 00:00:00 2001 From: Ben Wells Date: Thu, 17 Sep 2020 21:58:20 +0100 Subject: [PATCH] Check for postgres rows errors Signed-off-by: Ben Wells --- CHANGELOG.md | 1 + pkg/configs/db/postgres/postgres.go | 14 ++++++++++++++ 2 files changed, 15 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3fdddaa8188..d06d6f0b31b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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 diff --git a/pkg/configs/db/postgres/postgres.go b/pkg/configs/db/postgres/postgres.go index 654e220ce5e..2bd3bbd3e7c 100644 --- a/pkg/configs/db/postgres/postgres.go +++ b/pkg/configs/db/postgres/postgres.go @@ -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 } @@ -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 }