[query] Add a limit exceeded header if too many series are returned (#…

…1838)
m3db · Oct 11, 2019 · 57eba0c · 57eba0c
1 parent 81744f2
commit 57eba0c
Show file tree

Hide file tree

Showing 115 changed files with 3,939 additions and 1,209 deletions.
diff --git a/scripts/docker-integration-tests/query_fanout/docker-compose.yml b/scripts/docker-integration-tests/query_fanout/docker-compose.yml
@@ -14,9 +14,11 @@ services:
     expose:
       - "7201"
       - "7203"
+      - "7204"
     ports:
       - "0.0.0.0:7201:7201"
       - "0.0.0.0:7203:7203"
+      - "0.0.0.0:7204:7204"
     networks:
       - backend
     image: "m3coordinator_integration:${REVISION}"
@@ -36,9 +38,11 @@ services:
     expose:
       - "7201"
       - "7203"
+      - "7204"
     ports:
       - "0.0.0.0:17201:7201"
       - "0.0.0.0:17203:7203"
+      - "0.0.0.0:17204:7204"
     networks:
       - backend
     image: "m3coordinator_integration:${REVISION}"
@@ -58,9 +62,11 @@ services:
     expose:
       - "7201"
       - "7203"
+      - "7204"
     ports:
       - "0.0.0.0:27201:7201"
       - "0.0.0.0:27203:7203"
+      - "0.0.0.0:27204:7204"
     networks:
       - backend
     image: "m3coordinator_integration:${REVISION}"

diff --git a/scripts/docker-integration-tests/query_fanout/m3coordinator-cluster-a.yml b/scripts/docker-integration-tests/query_fanout/m3coordinator-cluster-a.yml
@@ -30,7 +30,7 @@ clusters:
       - namespace: agg
         type: aggregated
         retention: 10h
-        resolution: 15s
+        resolution: 5s
       - namespace: unagg
         type: unaggregated
         retention: 10m
@@ -48,5 +48,14 @@ clusters:
       writeConsistencyLevel: majority
       readConsistencyLevel: unstrict_majority
 
+carbon:
+  ingester:
+    listenAddress: "0.0.0.0:7204"
+    rules:
+      - pattern: .*
+        policies:
+          - resolution: 5s
+            retention: 10h
+
 tagOptions:
   idScheme: quoted
diff --git a/scripts/docker-integration-tests/query_fanout/m3coordinator-cluster-b.yml b/scripts/docker-integration-tests/query_fanout/m3coordinator-cluster-b.yml
@@ -30,7 +30,7 @@ clusters:
       - namespace: agg
         type: aggregated
         retention: 10h
-        resolution: 15s
+        resolution: 5s
       - namespace: unagg
         type: unaggregated
         retention: 10m
@@ -48,5 +48,14 @@ clusters:
       writeConsistencyLevel: majority
       readConsistencyLevel: unstrict_majority
 
+carbon:
+  ingester:
+    listenAddress: "0.0.0.0:7204"
+    rules:
+      - pattern: .*
+        policies:
+          - resolution: 5s
+            retention: 10h
+
 tagOptions:
   idScheme: quoted
diff --git a/scripts/docker-integration-tests/query_fanout/m3coordinator-cluster-c.yml b/scripts/docker-integration-tests/query_fanout/m3coordinator-cluster-c.yml
@@ -30,7 +30,7 @@ clusters:
       - namespace: agg
         type: aggregated
         retention: 10h
-        resolution: 15s
+        resolution: 5s
       - namespace: unagg
         type: unaggregated
         retention: 10m
@@ -48,5 +48,14 @@ clusters:
       writeConsistencyLevel: majority
       readConsistencyLevel: unstrict_majority
 
+carbon:
+  ingester:
+    listenAddress: "0.0.0.0:7204"
+    rules:
+      - pattern: .*
+        policies:
+          - resolution: 5s
+            retention: 10h
+
 tagOptions:
   idScheme: quoted
diff --git a/scripts/docker-integration-tests/query_fanout/test.sh b/scripts/docker-integration-tests/query_fanout/test.sh
@@ -3,6 +3,8 @@
 set -xe
 
 source $GOPATH/src/github.com/m3db/m3/scripts/docker-integration-tests/common.sh
+source $GOPATH/src/github.com/m3db/m3/scripts/docker-integration-tests/query_fanout/warning.sh
+
 REVISION=$(git rev-parse HEAD)
 COMPOSE_FILE=$GOPATH/src/github.com/m3db/m3/scripts/docker-integration-tests/query_fanout/docker-compose.yml
 export REVISION
@@ -211,3 +213,6 @@ function complete_tags {
 }
 
 ATTEMPTS=5 TIMEOUT=1 retry_with_backoff complete_tags
+
+echo "running fanout warning tests"
+test_fanout_warnings