fix querying out of retention (#16094)

if the db does not have enough data to satisfy a query, cancel it

1 files changed, 5 insertions, 3 deletions

diff --git a/web/api/queries/query.c b/web/api/queries/query.c
index 4f63755dc9..6b392de745 100644
--- a/web/api/queries/query.c
+++ b/web/api/queries/query.c
@@ -1364,10 +1364,12 @@ static bool query_plan(QUERY_ENGINE_OPS *ops, time_t after_wanted, time_t before
 
         if(!query_metric_is_valid_tier(qm, selected_tier))
             return false;
+    }
 
-        if(qm->tiers[selected_tier].db_first_time_s > before_wanted ||
-           qm->tiers[selected_tier].db_last_time_s < after_wanted)
-            return false;
+    if(qm->tiers[selected_tier].db_first_time_s > before_wanted ||
+       qm->tiers[selected_tier].db_last_time_s < after_wanted) {
+        // we don't have any data to satisfy this query
+        return false;
     }
 
     qm->plan.used = 1;