From ff829bf19778e2d83a4938b9ba78b0683ec76bf7 Mon Sep 17 00:00:00 2001
From: Tal Levy <JubBoy333@gmail.com>
Date: Fri, 30 Oct 2020 08:02:23 -0700
Subject: [PATCH] Removes yaml circuit-breaker tests for geoshape geogrid aggs
 (#64420)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

These tests were added to do a proper end-to-end test of the
memory usage of the geotile_grid and geohash_grid aggregations
on `geo_shape` fields. Although this was asperational,
the truth is — the test environment does not run these aggregations
in isolation. This means that the memory overhead is variable and
too flaky to rely on over time. The unit tests for circuit-breaking
remain.

Closes #63158.
---
 x-pack/plugin/spatial/build.gradle            |  1 -
 .../rest-api-spec/test/30_geotile_grid.yml    | 50 -------------------
 .../rest-api-spec/test/40_geohash_grid.yml    | 49 ------------------
 3 files changed, 100 deletions(-)

diff --git a/x-pack/plugin/spatial/build.gradle b/x-pack/plugin/spatial/build.gradle
index 0539e6cee42..a3ebafc60af 100644
--- a/x-pack/plugin/spatial/build.gradle
+++ b/x-pack/plugin/spatial/build.gradle
@@ -28,6 +28,5 @@ restResources {
 
 testClusters.all {
   setting 'xpack.license.self_generated.type', 'trial'
-  setting 'indices.breaker.request.limit', '25kb'
   testDistribution = 'DEFAULT'
 }
diff --git a/x-pack/plugin/spatial/src/yamlRestTest/resources/rest-api-spec/test/30_geotile_grid.yml b/x-pack/plugin/spatial/src/yamlRestTest/resources/rest-api-spec/test/30_geotile_grid.yml
index cf2e1ed8503..2b7471bdf85 100644
--- a/x-pack/plugin/spatial/src/yamlRestTest/resources/rest-api-spec/test/30_geotile_grid.yml
+++ b/x-pack/plugin/spatial/src/yamlRestTest/resources/rest-api-spec/test/30_geotile_grid.yml
@@ -55,53 +55,3 @@
   - match: { aggregations.grid.buckets.0.doc_count: 4 }
   - match: { aggregations.grid.buckets.1.key: "5/16/11" }
   - match: { aggregations.grid.buckets.1.doc_count: 2 }
-
----
-"Test geotile_grid aggregation circuit breaker":
-  - do:
-      indices.create:
-        index: locations
-        body:
-          settings:
-            number_of_shards: 1
-            number_of_replicas: 0
-          mappings:
-            properties:
-              location:
-                type: geo_shape
-
-  - do:
-      index:
-        index:  locations
-        id:     box
-        body:   { location: "POLYGON((-173.671875 -77.8418477505252,173.32031249999997 -77.8418477505252,173.32031249999997 83.52016238353205,-173.671875 83.52016238353205,-173.671875 -77.8418477505252))" }
-
-  - do:
-      indices.refresh: {}
-
-  - do:
-      catch: /data for \[<agg \[grid\]>\] would be \[42760\/41.7kb\], which is larger than the limit of \[25600\/25kb\]/
-      search:
-        rest_total_hits_as_int: true
-        index: locations
-        size: 0
-        body:
-          aggs:
-            grid:
-              geotile_grid:
-                precision: 11
-                field: location
-
-  - do:
-      catch: /data for \[<agg \[grid\]>\] would be \[42760\/41.7kb\], which is larger than the limit of \[25600\/25kb\]/
-      search:
-        rest_total_hits_as_int: true
-        index: locations
-        size: 0
-        body:
-          aggs:
-            grid:
-              geotile_grid:
-                precision: 11
-                field: location
-
diff --git a/x-pack/plugin/spatial/src/yamlRestTest/resources/rest-api-spec/test/40_geohash_grid.yml b/x-pack/plugin/spatial/src/yamlRestTest/resources/rest-api-spec/test/40_geohash_grid.yml
index 1b825147c22..4f41f6b75c4 100644
--- a/x-pack/plugin/spatial/src/yamlRestTest/resources/rest-api-spec/test/40_geohash_grid.yml
+++ b/x-pack/plugin/spatial/src/yamlRestTest/resources/rest-api-spec/test/40_geohash_grid.yml
@@ -57,52 +57,3 @@
   - match: { aggregations.grid.buckets.1.doc_count: 2 }
   - match: { aggregations.grid.buckets.2.key: "u155" }
   - match: { aggregations.grid.buckets.2.doc_count: 1 }
-
----
-"Test geohash_grid aggregation circuit breaker":
-  - do:
-      indices.create:
-        index: locations
-        body:
-          settings:
-            number_of_shards: 1
-            number_of_replicas: 0
-          mappings:
-            properties:
-              location:
-                type: geo_shape
-
-  - do:
-      index:
-        index:  locations
-        id:     box
-        body:   { location: "POLYGON((-173.671875 -77.8418477505252,173.32031249999997 -77.8418477505252,173.32031249999997 83.52016238353205,-173.671875 83.52016238353205,-173.671875 -77.8418477505252))" }
-
-  - do:
-      indices.refresh: {}
-
-  - do:
-      catch: /data for \[<agg \[grid\]>\] would be \[30160\/29.4kb\], which is larger than the limit of \[25600\/25kb\]/
-      search:
-        rest_total_hits_as_int: true
-        index: locations
-        size: 0
-        body:
-          aggs:
-            grid:
-              geotile_grid:
-                precision: 10
-                field: location
-
-  - do:
-      catch: /data for \[<agg \[grid\]>\] would be \[30160\/29.4kb\], which is larger than the limit of \[25600\/25kb\]/
-      search:
-        rest_total_hits_as_int: true
-        index: locations
-        size: 0
-        body:
-          aggs:
-            grid:
-              geotile_grid:
-                precision: 10
-                field: location