Fix up usage of index refreshing

Author: JoshMock

test_elasticsearch_serverless/test_async/test_server/test_helpers.py

@@ -214,11 +214,11 @@ async def test_rejected_documents_are_retried(self, async_client):
                 chunk_size=1,
                 max_retries=1,
                 initial_backoff=0,
+                refresh=True,
             )
         ]
         assert 3 == len(results)
         assert [True, True, True] == [r[0] for r in results]
-        await async_client.indices.refresh(index="i")
         res = await async_client.search(index="i")
         assert {"value": 3, "relation": "eq"} == res["hits"]["total"]
         assert 4 == failing_client._called
@@ -253,11 +253,11 @@ async def test_rejected_documents_are_retried_at_most_max_retries_times(
                 chunk_size=1,
                 max_retries=1,
                 initial_backoff=0,
+                refresh=True,
             )
         ]
         assert 3 == len(results)
         assert [False, True, True] == [r[0] for r in results]
-        await async_client.indices.refresh(index="i")
         res = await async_client.search(index="i")
         assert {"value": 2, "relation": "eq"} == res["hits"]["total"]
         assert 4 == failing_client._called
@@ -911,8 +911,8 @@ async def test_reindex_accepts_a_query(self, async_client, reindex_setup):
             "test_index",
             "prod_index",
             query={"query": {"bool": {"filter": {"term": {"type": "answers"}}}}},
+            bulk_kwargs={"refresh": True},
         )
-        await async_client.indices.refresh()
 
         assert await async_client.indices.exists(index="prod_index")
         assert (
@@ -925,8 +925,7 @@ async def test_reindex_accepts_a_query(self, async_client, reindex_setup):
         )["_source"]
 
     async def test_all_documents_get_moved(self, async_client, reindex_setup):
-        await helpers.async_reindex(async_client, "test_index", "prod_index")
-        await async_client.indices.refresh()
+        await helpers.async_reindex(async_client, "test_index", "prod_index", bulk_kwargs={"refresh": True})
 
         assert await async_client.indices.exists(index="prod_index")
         assert (
@@ -969,8 +968,8 @@ async def parent_reindex_setup(async_client):
         id=47,
         routing=42,
         body={"some": "data", "question_answer": {"name": "answer", "parent": 42}},
+        refresh=True,
     )
-    await async_client.indices.refresh(index="test-index")
 
 
 class TestParentChildReindex:
@@ -1028,8 +1027,7 @@ async def reindex_data_stream_setup(async_client):
             "data_stream": {},
         },
     )
-    await async_client.indices.create_data_stream(name="py-test-stream")
-    await async_client.indices.refresh()
+    await async_client.indices.create_data_stream(name="py-test-stream", refresh=True)
     yield
 
 
@@ -1046,7 +1044,6 @@ async def test_reindex_index_datastream(
             bulk_kwargs={"refresh": True},
             op_type=op_type,
         )
-        # await async_client.indices.refresh()
         assert await async_client.indices.exists(index="py-test-stream")
         assert (
             50

test_elasticsearch_serverless/test_server/test_helpers.py

@@ -66,7 +66,7 @@ def test_bulk_actions_remain_unchanged(sync_client):
 def test_bulk_all_documents_get_inserted(sync_client):
     docs = [{"answer": x, "_id": x} for x in range(100)]
     for ok, item in helpers.streaming_bulk(
-        sync_client, docs, index="test-index"
+        sync_client, docs, index="test-index", refresh=True,
     ):
         assert ok
 
@@ -171,6 +171,7 @@ def test_bulk_rejected_documents_are_retried(sync_client):
             chunk_size=1,
             max_retries=1,
             initial_backoff=0,
+            refresh=True,
         )
     )
     assert 3 == len(results)
@@ -209,6 +210,7 @@ def test_bulk_rejected_documents_are_retried_when_bytes_or_string(
             chunk_size=1,
             max_retries=1,
             initial_backoff=0,
+            refresh=True,
         )
     )
     assert 3 == len(results)
@@ -245,6 +247,7 @@ def test_bulk_rejected_documents_are_retried_at_most_max_retries_times(sync_clie
             chunk_size=1,
             max_retries=1,
             initial_backoff=0,
+            refresh=True,
         )
     )
     assert 3 == len(results)
@@ -286,7 +289,7 @@ def streaming_bulk():
 
 def test_bulk_works_with_single_item(sync_client):
     docs = [{"answer": 42, "_id": 1}]
-    success, failed = helpers.bulk(sync_client, docs, index="test-index")
+    success, failed = helpers.bulk(sync_client, docs, index="test-index", refresh=True)
 
     assert 1 == success
     assert not failed
@@ -296,7 +299,7 @@ def test_bulk_works_with_single_item(sync_client):
 
 def test_all_documents_get_inserted(sync_client):
     docs = [{"answer": x, "_id": x} for x in range(100)]
-    success, failed = helpers.bulk(sync_client, docs, index="test-index")
+    success, failed = helpers.bulk(sync_client, docs, index="test-index", refresh=True)
 
     assert 100 == success
     assert not failed
@@ -307,7 +310,7 @@ def test_all_documents_get_inserted(sync_client):
 def test_stats_only_reports_numbers(sync_client):
     docs = [{"answer": x} for x in range(100)]
     success, failed = helpers.bulk(
-        sync_client, docs, index="test-index", stats_only=True
+        sync_client, docs, index="test-index", refresh=True, stats_only=True
     )
 
     assert 100 == success
@@ -435,7 +438,7 @@ def test_order_can_be_preserved(sync_client):
     for x in range(100):
         bulk.append({"index": {"_index": "test_index", "_id": x}})
         bulk.append({"answer": x, "correct": x == 42})
-    sync_client.bulk(operations=bulk)
+    sync_client.bulk(operations=bulk, refresh=True)
 
     docs = list(
         helpers.scan(
@@ -457,7 +460,7 @@ def test_all_documents_are_read(sync_client):
     for x in range(100):
         bulk.append({"index": {"_index": "test_index", "_id": x}})
         bulk.append({"answer": x, "correct": x == 42})
-    sync_client.bulk(operations=bulk)
+    sync_client.bulk(operations=bulk, refresh=True)
 
     docs = list(helpers.scan(sync_client, index="test_index", size=2))
 
@@ -472,7 +475,7 @@ def test_scroll_error(sync_client):
     for x in range(4):
         bulk.append({"index": {"_index": "test_index"}})
         bulk.append({"value": x})
-    sync_client.bulk(operations=bulk)
+    sync_client.bulk(operations=bulk, refresh=True)
 
     with patch.object(sync_client, "options", return_value=sync_client), patch.object(
         sync_client, "scroll"
@@ -734,7 +737,7 @@ def test_clear_scroll(sync_client):
     for x in range(4):
         bulk.append({"index": {"_index": "test_index"}})
         bulk.append({"value": x})
-    sync_client.bulk(operations=bulk)
+    sync_client.bulk(operations=bulk, refresh=True)
 
     with patch.object(sync_client, "options", return_value=sync_client), patch.object(
         sync_client, "clear_scroll", wraps=sync_client.clear_scroll
@@ -833,7 +836,7 @@ def reindex_setup(sync_client):
                 "type": "answers" if x % 2 == 0 else "questions",
             }
         )
-    sync_client.bulk(operations=bulk)
+    sync_client.bulk(operations=bulk, refresh=True)
 
 
 @pytest.mark.usefixtures("reindex_setup")
@@ -843,6 +846,7 @@ def test_reindex_passes_kwargs_to_scan_and_bulk(sync_client):
         "test_index",
         "prod_index",
         scan_kwargs={"q": "type:answers"},
+        bulk_kwargs={"refresh": True},
     )
 
     assert sync_client.indices.exists(index="prod_index")
@@ -860,6 +864,7 @@ def test_reindex_accepts_a_query(sync_client):
         "test_index",
         "prod_index",
         query={"query": {"bool": {"filter": {"term": {"type": "answers"}}}}},
+        bulk_kwargs={"refresh": True},
     )
 
     assert sync_client.indices.exists(index="prod_index")
@@ -872,7 +877,7 @@ def test_reindex_accepts_a_query(sync_client):
 
 @pytest.mark.usefixtures("reindex_setup")
 def test_all_documents_get_moved(sync_client):
-    helpers.reindex(sync_client, "test_index", "prod_index")
+    helpers.reindex(sync_client, "test_index", "prod_index", bulk_kwargs={"refresh": True})
 
     assert sync_client.indices.exists(index="prod_index")
     assert 50 == sync_client.count(index="prod_index", q="type:questions")["count"]
@@ -904,6 +909,7 @@ def parent_child_reindex_setup(sync_client):
         id=47,
         routing=42,
         body={"some": "data", "question_answer": {"name": "answer", "parent": 42}},
+        refresh=True,
     )
 
 
@@ -951,7 +957,7 @@ def reindex_data_stream_setup(sync_client):
                 "@timestamp": (dt - timedelta(days=x)).isoformat(),
             }
         )
-    sync_client.bulk(operations=bulk)
+    sync_client.bulk(operations=bulk, refresh=True)
     sync_client.indices.put_index_template(
         name="my-index-template",
         body={

test_elasticsearch_serverless/test_server/test_mapbox_vector_tile.py

@@ -67,7 +67,6 @@ def mvt_setup(sync_client):
                 "included": True,
             },
         ],
-        refresh=True,
     )