Merge branch 'main' into dom/wal-syscalls

ingester2/src/query/result_instrumentation.rs

@@ -166,7 +166,7 @@ impl<T> QueryResultInstrumentation<T> {
             .register_metric_with_options::<U64Histogram, _>(
                 "ingester_query_result_partition",
                 "distribution of query result partition count sent to the client",
-                || U64HistogramOptions::new([1, 2, 3, 4, 5]),
+                || U64HistogramOptions::new([1, 2, 3, 4, 5, 6, 7, 8, 9, 10]),
             )
             .recorder(&[]);
 

ingester2/src/server/grpc/query.rs

@@ -176,7 +176,7 @@ where
             warn!(predicate=?p, "ignoring query predicate (unsupported)");
         }
 
-        let response = self
+        let response = match self
             .query_handler
             .query_exec(
                 namespace_id,
@@ -184,7 +184,19 @@ where
                 request.columns,
                 span_ctx.child_span("ingester query"),
             )
-            .await?;
+            .await
+        {
+            Ok(v) => v,
+            Err(e) => {
+                error!(
+                    error=%e,
+                    %namespace_id,
+                    %table_id,
+                    "query error"
+                );
+                return Err(e)?;
+            }
+        };
 
         let output = encode_response(response, self.ingester_id).map_err(tonic::Status::from);