[7.x] Start using wipe_cluster() for consistent cluster state
Co-authored-by: Seth Michael Larson <seth.larson@elastic.co>
This commit is contained in:
committed by
GitHub
parent
876bf90943
commit
b33e18ba0d
+18
-18
@@ -1,20 +1,20 @@
|
||||
-----BEGIN CERTIFICATE-----
|
||||
MIIDSTCCAjGgAwIBAgIUIwN+0zglsexRKwE1RGHvlCcmrdwwDQYJKoZIhvcNAQEL
|
||||
BQAwNDEyMDAGA1UEAxMpRWxhc3RpYyBDZXJ0aWZpY2F0ZSBUb29sIEF1dG9nZW5l
|
||||
cmF0ZWQgQ0EwHhcNMTkwMjEzMDcyMjQwWhcNMjIwMjEyMDcyMjQwWjA0MTIwMAYD
|
||||
VQQDEylFbGFzdGljIENlcnRpZmljYXRlIFRvb2wgQXV0b2dlbmVyYXRlZCBDQTCC
|
||||
ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANILs0JO0e7x29zeVx21qalK
|
||||
XKdX+AMlGJPH75wWO/Jq6YHtxt1wYIg762krOBXfG6JsFSOIwIv5VrzGGRGjSPt9
|
||||
OXQyXrDDiQvsBT3rpzLNdDs7KMl2tZswwv7w9ujgud0cYnS1MOpn81rfPc73DvMg
|
||||
xuhplofDx6fn3++PjVRU2FNiIVWyEoaxRjCeGPMBubKZYaYbQA6vYM4Z+ByG727B
|
||||
AyAER3t7xmvYti/EoO2hv2HQk5zgcj/Oq3AJKhnt8LH8fnfm3TnYNM1htvXqhN05
|
||||
vsvhvm2PHfnA5qLlSr/3W0aI/U/PqfsFDCgyRV097sMIaKkmavb0Ue7aQ7lgtp0C
|
||||
AwEAAaNTMFEwHQYDVR0OBBYEFDRKlCMowWR1rwxE0d1lTEQe5O71MB8GA1UdIwQY
|
||||
MBaAFDRKlCMowWR1rwxE0d1lTEQe5O71MA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZI
|
||||
hvcNAQELBQADggEBAKbCJ95EBpeuvF70KEt6QU70k/SH1NRvM9YzKryV0D975Jvu
|
||||
HOSm9HgSTULeAUFZIa4oYyf3QUfVoI+2T/aQrfXA3gfrJWsHURkyNmiHOFAbYHqi
|
||||
xA6i249G2GTEjc1+le/M2N2CcDKAmurW6vSGK4upXQbPd6KmnhHREX74zkWjnOa+
|
||||
+tibbSSOCT4Tmja2DbBxAPuivU9IB1g/hIUmbYQqKffQrBJA0658tz6w63a/Q7xN
|
||||
pCvvbSgiMZ6qcVIcJkBT2IooYie+ax45pQECHthgIUcQAzfmIfqlU0Qfl8rDgAmn
|
||||
0c1o6HQjKGU2aVGgSRuaaiHaSZjbPIZVS51sOoI=
|
||||
MIIDSjCCAjKgAwIBAgIVAJQLm8V2LcaCTHUcoIfO+KL63nG3MA0GCSqGSIb3DQEB
|
||||
CwUAMDQxMjAwBgNVBAMTKUVsYXN0aWMgQ2VydGlmaWNhdGUgVG9vbCBBdXRvZ2Vu
|
||||
ZXJhdGVkIENBMB4XDTIwMDIyNjA1NTA1N1oXDTIzMDIyNTA1NTA1N1owNDEyMDAG
|
||||
A1UEAxMpRWxhc3RpYyBDZXJ0aWZpY2F0ZSBUb29sIEF1dG9nZW5lcmF0ZWQgQ0Ew
|
||||
ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDYyajkPvGtUOE5M1OowQfB
|
||||
kWVrWjo1+LIxzgCeRHp0YztLtdVJ0sk2xoSrt2uZpxcPepdyOseLTjFJex1D2yCR
|
||||
AEniIqcFif4G72nDih2LlbhpUe/+/MTryj8ZTkFTzI+eMmbQi5FFMaH+kwufmdt/
|
||||
5/w8YazO18SxxJUlzMqzfNUrhM8vvvVdxgboU7PWhk28wZHCMHQovomHmzclhRpF
|
||||
N0FMktA98vHHeRjH19P7rNhifSd7hZzoH3H148HVAKoPgqnZ6vW2O2YfAWOP6ulq
|
||||
cyszr57p8fS9B2wSdlWW7nVHU1JuKcYD67CxbBS23BeGFgCj4tiNrmxO8S5Yf85v
|
||||
AgMBAAGjUzBRMB0GA1UdDgQWBBSWAlip9eoPmnG4p4OFZeOUBlAbNDAfBgNVHSME
|
||||
GDAWgBSWAlip9eoPmnG4p4OFZeOUBlAbNDAPBgNVHRMBAf8EBTADAQH/MA0GCSqG
|
||||
SIb3DQEBCwUAA4IBAQA19qqrMTWl7YyId+LR/QIHDrP4jfxmrEELrAL58q5Epc1k
|
||||
XxZLzOBSXoBfBrPdv+3XklWqXrZjKWfdkux0Xmjnl4qul+srrZDLJVZG3I7IrITh
|
||||
AmQUmL9MuPiMnAcxoGZp1xpijtW8Qmd2qnambbljWfkuVaa4hcVRfrAX6TciIQ21
|
||||
bS5aeLGrPqR14h30YzDp0RMmTujEa1o6ExN0+RSTkE9m89Q6WdM69az8JW7YkWqm
|
||||
I+UCG3TcLd3TXmN1zNQkq4y2ObDK4Sxy/2p6yFPI1Fds5w/zLfBOvvPQY61vEqs8
|
||||
SCCcQIe7f6NDpIRIBlty1C9IaEHj7edyHjF6rtYb
|
||||
-----END CERTIFICATE-----
|
||||
|
||||
+18
-18
@@ -1,20 +1,20 @@
|
||||
-----BEGIN CERTIFICATE-----
|
||||
MIIDSTCCAjGgAwIBAgIUIwN+0zglsexRKwE1RGHvlCcmrdwwDQYJKoZIhvcNAQEL
|
||||
BQAwNDEyMDAGA1UEAxMpRWxhc3RpYyBDZXJ0aWZpY2F0ZSBUb29sIEF1dG9nZW5l
|
||||
cmF0ZWQgQ0EwHhcNMTkwMjEzMDcyMjQwWhcNMjIwMjEyMDcyMjQwWjA0MTIwMAYD
|
||||
VQQDEylFbGFzdGljIENlcnRpZmljYXRlIFRvb2wgQXV0b2dlbmVyYXRlZCBDQTCC
|
||||
ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANILs0JO0e7x29zeVx21qalK
|
||||
XKdX+AMlGJPH75wWO/Jq6YHtxt1wYIg762krOBXfG6JsFSOIwIv5VrzGGRGjSPt9
|
||||
OXQyXrDDiQvsBT3rpzLNdDs7KMl2tZswwv7w9ujgud0cYnS1MOpn81rfPc73DvMg
|
||||
xuhplofDx6fn3++PjVRU2FNiIVWyEoaxRjCeGPMBubKZYaYbQA6vYM4Z+ByG727B
|
||||
AyAER3t7xmvYti/EoO2hv2HQk5zgcj/Oq3AJKhnt8LH8fnfm3TnYNM1htvXqhN05
|
||||
vsvhvm2PHfnA5qLlSr/3W0aI/U/PqfsFDCgyRV097sMIaKkmavb0Ue7aQ7lgtp0C
|
||||
AwEAAaNTMFEwHQYDVR0OBBYEFDRKlCMowWR1rwxE0d1lTEQe5O71MB8GA1UdIwQY
|
||||
MBaAFDRKlCMowWR1rwxE0d1lTEQe5O71MA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZI
|
||||
hvcNAQELBQADggEBAKbCJ95EBpeuvF70KEt6QU70k/SH1NRvM9YzKryV0D975Jvu
|
||||
HOSm9HgSTULeAUFZIa4oYyf3QUfVoI+2T/aQrfXA3gfrJWsHURkyNmiHOFAbYHqi
|
||||
xA6i249G2GTEjc1+le/M2N2CcDKAmurW6vSGK4upXQbPd6KmnhHREX74zkWjnOa+
|
||||
+tibbSSOCT4Tmja2DbBxAPuivU9IB1g/hIUmbYQqKffQrBJA0658tz6w63a/Q7xN
|
||||
pCvvbSgiMZ6qcVIcJkBT2IooYie+ax45pQECHthgIUcQAzfmIfqlU0Qfl8rDgAmn
|
||||
0c1o6HQjKGU2aVGgSRuaaiHaSZjbPIZVS51sOoI=
|
||||
MIIDSjCCAjKgAwIBAgIVAJQLm8V2LcaCTHUcoIfO+KL63nG3MA0GCSqGSIb3DQEB
|
||||
CwUAMDQxMjAwBgNVBAMTKUVsYXN0aWMgQ2VydGlmaWNhdGUgVG9vbCBBdXRvZ2Vu
|
||||
ZXJhdGVkIENBMB4XDTIwMDIyNjA1NTA1N1oXDTIzMDIyNTA1NTA1N1owNDEyMDAG
|
||||
A1UEAxMpRWxhc3RpYyBDZXJ0aWZpY2F0ZSBUb29sIEF1dG9nZW5lcmF0ZWQgQ0Ew
|
||||
ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDYyajkPvGtUOE5M1OowQfB
|
||||
kWVrWjo1+LIxzgCeRHp0YztLtdVJ0sk2xoSrt2uZpxcPepdyOseLTjFJex1D2yCR
|
||||
AEniIqcFif4G72nDih2LlbhpUe/+/MTryj8ZTkFTzI+eMmbQi5FFMaH+kwufmdt/
|
||||
5/w8YazO18SxxJUlzMqzfNUrhM8vvvVdxgboU7PWhk28wZHCMHQovomHmzclhRpF
|
||||
N0FMktA98vHHeRjH19P7rNhifSd7hZzoH3H148HVAKoPgqnZ6vW2O2YfAWOP6ulq
|
||||
cyszr57p8fS9B2wSdlWW7nVHU1JuKcYD67CxbBS23BeGFgCj4tiNrmxO8S5Yf85v
|
||||
AgMBAAGjUzBRMB0GA1UdDgQWBBSWAlip9eoPmnG4p4OFZeOUBlAbNDAfBgNVHSME
|
||||
GDAWgBSWAlip9eoPmnG4p4OFZeOUBlAbNDAPBgNVHRMBAf8EBTADAQH/MA0GCSqG
|
||||
SIb3DQEBCwUAA4IBAQA19qqrMTWl7YyId+LR/QIHDrP4jfxmrEELrAL58q5Epc1k
|
||||
XxZLzOBSXoBfBrPdv+3XklWqXrZjKWfdkux0Xmjnl4qul+srrZDLJVZG3I7IrITh
|
||||
AmQUmL9MuPiMnAcxoGZp1xpijtW8Qmd2qnambbljWfkuVaa4hcVRfrAX6TciIQ21
|
||||
bS5aeLGrPqR14h30YzDp0RMmTujEa1o6ExN0+RSTkE9m89Q6WdM69az8JW7YkWqm
|
||||
I+UCG3TcLd3TXmN1zNQkq4y2ObDK4Sxy/2p6yFPI1Fds5w/zLfBOvvPQY61vEqs8
|
||||
SCCcQIe7f6NDpIRIBlty1C9IaEHj7edyHjF6rtYb
|
||||
-----END CERTIFICATE-----
|
||||
|
||||
+19
-17
@@ -1,19 +1,21 @@
|
||||
-----BEGIN CERTIFICATE-----
|
||||
MIIDIjCCAgqgAwIBAgIUI4QU6jA1dYSCbdIA6oAb2TBEluowDQYJKoZIhvcNAQEL
|
||||
BQAwNDEyMDAGA1UEAxMpRWxhc3RpYyBDZXJ0aWZpY2F0ZSBUb29sIEF1dG9nZW5l
|
||||
cmF0ZWQgQ0EwHhcNMTkwMjEzMDcyMzEzWhcNMjIwMjEyMDcyMzEzWjATMREwDwYD
|
||||
VQQDEwhpbnN0YW5jZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJeT
|
||||
yOy6EAScZxrULKjHePciiz38grivCrhFFV+dThaRCcl3DhDzb9Eny5q5iEw3WvLQ
|
||||
Rqmf01jncNIhaocTt66VqveXaMubbE8O0LcG6e4kpFO+JtnVF8JTARTc+ux/1uD6
|
||||
hO1VG/HItM7WQrQxh4hfB2u1AX2YQtoqEtXXEC+UHWfl4QzuzXjBnKCkO/L9/6Tf
|
||||
yNFQWXxKnIiTs8Xm9sEhhSCBJPlLTQu+MX4vR2Uwj5XZmflDUr+ZTenl9qYxL6b3
|
||||
SWhh/qEl4GAj1+tS7ZZOxE0237mUh3IIFYSWSaMm8K2m/BYHkLNWL5B1dMic0lsv
|
||||
osSoYrQuCef4HQMCitsCAwEAAaNNMEswHQYDVR0OBBYEFFMg4l1GLW8lYbwASY+r
|
||||
YeWYRzIiMB8GA1UdIwQYMBaAFDRKlCMowWR1rwxE0d1lTEQe5O71MAkGA1UdEwQC
|
||||
MAAwDQYJKoZIhvcNAQELBQADggEBAEQrgh1xALpumQTzsjxFRGque/vlKTgRs5Kh
|
||||
xtgapr6wjIbdq7dagee+4yNOKzS5lGVXCgwrJlHESv9qY0uumT/33vK2uduJ7NAd
|
||||
fR2ZzyBnhMX+mkYhmGrGYCTUMUIwOIQYa4Evis4W+LHmCIDG03l7gLHfdIBe9VMO
|
||||
pDZum8f6ng0MM49s8/rXODNYKw8kFyUhnfChqMi/2yggb1uUIfKlJJIchkgYjE13
|
||||
zuC+fjo029Pq1jeMIdxugLf/7I/8NiW1Yj9aCXevUXG1qzHFEuKAinBXYOZO/vWS
|
||||
LaEqOhwrzNynwgGpYAr7Rfgv4AflltYIIav4PZT03P7fbyAAf8s=
|
||||
MIIDYjCCAkqgAwIBAgIVAIZQH0fe5U+bGQ6m1JUBO/AQkQ/9MA0GCSqGSIb3DQEB
|
||||
CwUAMDQxMjAwBgNVBAMTKUVsYXN0aWMgQ2VydGlmaWNhdGUgVG9vbCBBdXRvZ2Vu
|
||||
ZXJhdGVkIENBMB4XDTIwMDMyNzE5MTcxMVoXDTIzMDMyNzE5MTcxMVowEzERMA8G
|
||||
A1UEAxMIaW5zdGFuY2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDB
|
||||
fco1t1+sE1gTwTVGcXKZqJTP2GjMHM0cfJE5KKfwC5B+pHADRT6FZxvepgKjEBDt
|
||||
CK+2Rmotyeb15XXMSKguNhyT+2PuKvT5r05L7P91XRYXrwxG2swJPtct7A87xdFa
|
||||
Ek+YRpqGGmTaux2jOELMiAmqEzoj6w/xFq+LF4SolTW4wOL2eLFkEFHBX2oCwU5T
|
||||
Q+B+7E9zL45nFWlkeRGJ+ZQTnRNZ/1r4N9A9Gtj4x/H1/y4inWndikdxAb5QiEYJ
|
||||
T+vbQWzHYWjz13ttHJsz+6T8rvA1jK+buHgVh4K8lV13X9k54soBqHB8va7/KIJP
|
||||
g8gvd6vusEI7Bmfl1as7AgMBAAGjgYswgYgwHQYDVR0OBBYEFKnnpvuVYwtFSUis
|
||||
WwN9OHLyExzJMB8GA1UdIwQYMBaAFJYCWKn16g+acbing4Vl45QGUBs0MDsGA1Ud
|
||||
EQQ0MDKCCWxvY2FsaG9zdIIIaW5zdGFuY2WHBH8AAAGHEAAAAAAAAAAAAAAAAAAA
|
||||
AAGCA2VzMTAJBgNVHRMEAjAAMA0GCSqGSIb3DQEBCwUAA4IBAQAPNsIoD4GBrTgR
|
||||
jfvBuHS6eU16P95m16O8Mdpr4SMQgWLQUhs8aoVgfwpg2TkbCWxOe6khJOyNm7bf
|
||||
fW4aFQ/OHcQV4Czz3c7eOHTWSyMlCOv+nRXd4giJZ5TOHw1zKGmKXOIvhvE6RfdF
|
||||
uBBfrusk164H4iykm0Bbr/wo4d6wuebp3ZYLPw5zV0D08rsaR+3VJ9VxWuFpdm/r
|
||||
2onYOohyuX9DRjAczasC+CRRQN4eHJlRfSQB8WfTKw3EloRJJDAg6SJyGiAJ++BF
|
||||
hnqfNcEyKes2AWagFF9aTbEJMrzMhH+YB5F+S/PWvMUlFzcoocVKqc4pIrjKUNWO
|
||||
6nbTxeAB
|
||||
-----END CERTIFICATE-----
|
||||
|
||||
+25
-25
@@ -1,27 +1,27 @@
|
||||
-----BEGIN RSA PRIVATE KEY-----
|
||||
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
|
||||
-----END RSA PRIVATE KEY-----
|
||||
|
||||
@@ -19,6 +19,7 @@ import os
|
||||
import pytest
|
||||
import asyncio
|
||||
import elasticsearch
|
||||
from ...utils import wipe_cluster
|
||||
|
||||
pytestmark = pytest.mark.asyncio
|
||||
|
||||
@@ -31,7 +32,7 @@ async def async_client():
|
||||
pytest.skip("test requires 'AsyncElasticsearch'")
|
||||
|
||||
kw = {
|
||||
"timeout": 30,
|
||||
"timeout": 3,
|
||||
"ca_certs": ".ci/certs/ca.pem",
|
||||
"connection_class": elasticsearch.AIOHttpConnection,
|
||||
}
|
||||
@@ -55,20 +56,5 @@ async def async_client():
|
||||
|
||||
finally:
|
||||
if client:
|
||||
version = tuple(
|
||||
[
|
||||
int(x) if x.isdigit() else 999
|
||||
for x in (await client.info())["version"]["number"].split(".")
|
||||
]
|
||||
)
|
||||
|
||||
expand_wildcards = ["open", "closed"]
|
||||
if version >= (7, 7):
|
||||
expand_wildcards.append("hidden")
|
||||
|
||||
await client.indices.delete(
|
||||
index="*", ignore=404, expand_wildcards=expand_wildcards
|
||||
)
|
||||
await client.indices.delete_template(name="*", ignore=404)
|
||||
await client.indices.delete_index_template(name="*", ignore=404)
|
||||
wipe_cluster(client)
|
||||
await client.close()
|
||||
|
||||
@@ -390,7 +390,7 @@ class MockResponse:
|
||||
@pytest.fixture(scope="function")
|
||||
async def scan_teardown(async_client):
|
||||
yield
|
||||
async_client.clear_scroll(scroll_id="_all")
|
||||
await async_client.clear_scroll(scroll_id="_all")
|
||||
|
||||
|
||||
class TestScan(object):
|
||||
|
||||
@@ -56,42 +56,6 @@ class AsyncYamlRunner(YamlRunner):
|
||||
if self._teardown_code:
|
||||
await self.run_code(self._teardown_code)
|
||||
|
||||
for repo, definition in (
|
||||
await self.client.snapshot.get_repository(repository="_all")
|
||||
).items():
|
||||
snapshots = (
|
||||
await self.client.snapshot.get(
|
||||
repository=repo, snapshot="_all", ignore=404
|
||||
)
|
||||
).get("snapshots", [])
|
||||
for snapshot in snapshots:
|
||||
await self.client.snapshot.delete(
|
||||
repository=repo, snapshot=snapshot["snapshot"], ignore=404
|
||||
)
|
||||
await self.client.snapshot.delete_repository(repository=repo)
|
||||
|
||||
# stop and remove all ML stuff
|
||||
if await self._feature_enabled("ml"):
|
||||
await self.client.ml.stop_datafeed(datafeed_id="*", force=True)
|
||||
for feed in (await self.client.ml.get_datafeeds(datafeed_id="*"))[
|
||||
"datafeeds"
|
||||
]:
|
||||
await self.client.ml.delete_datafeed(datafeed_id=feed["datafeed_id"])
|
||||
|
||||
await self.client.ml.close_job(job_id="*", force=True)
|
||||
for job in (await self.client.ml.get_jobs(job_id="*"))["jobs"]:
|
||||
await self.client.ml.delete_job(
|
||||
job_id=job["job_id"], wait_for_completion=True, force=True
|
||||
)
|
||||
|
||||
# stop and remove all Rollup jobs
|
||||
if await self._feature_enabled("rollup"):
|
||||
for rollup in (await self.client.rollup.get_jobs(id="*"))["jobs"]:
|
||||
await self.client.rollup.stop_job(
|
||||
id=rollup["config"]["id"], wait_for_completion=True
|
||||
)
|
||||
await self.client.rollup.delete_job(id=rollup["config"]["id"])
|
||||
|
||||
async def es_version(self):
|
||||
global ES_VERSION
|
||||
if ES_VERSION is None:
|
||||
|
||||
@@ -19,6 +19,7 @@ import os
|
||||
import time
|
||||
import pytest
|
||||
import elasticsearch
|
||||
from ..utils import wipe_cluster
|
||||
|
||||
|
||||
@pytest.fixture(scope="function")
|
||||
@@ -26,7 +27,7 @@ def sync_client():
|
||||
client = None
|
||||
try:
|
||||
kw = {
|
||||
"timeout": 30,
|
||||
"timeout": 3,
|
||||
"ca_certs": ".ci/certs/ca.pem",
|
||||
"connection_class": getattr(
|
||||
elasticsearch,
|
||||
@@ -53,20 +54,5 @@ def sync_client():
|
||||
|
||||
finally:
|
||||
if client:
|
||||
version = tuple(
|
||||
[
|
||||
int(x) if x.isdigit() else 999
|
||||
for x in (client.info())["version"]["number"].split(".")
|
||||
]
|
||||
)
|
||||
|
||||
expand_wildcards = ["open", "closed"]
|
||||
if version >= (7, 7):
|
||||
expand_wildcards.append("hidden")
|
||||
|
||||
client.indices.delete(
|
||||
index="*", ignore=404, expand_wildcards=expand_wildcards
|
||||
)
|
||||
client.indices.delete_template(name="*", ignore=404)
|
||||
client.indices.delete_index_template(name="*", ignore=404)
|
||||
client.transport.close()
|
||||
wipe_cluster(client)
|
||||
client.close()
|
||||
|
||||
@@ -53,30 +53,9 @@ IMPLEMENTED_FEATURES = {
|
||||
|
||||
# broken YAML tests on some releases
|
||||
SKIP_TESTS = {
|
||||
# can't figure out the expand_wildcards=open issue?
|
||||
"indices/get_alias/10_basic[23]",
|
||||
# [interval] on [date_histogram] is deprecated, use [fixed_interval] or [calendar_interval] in the future.
|
||||
"search/aggregation/230_composite[6]",
|
||||
"search/aggregation/250_moving_fn[1]",
|
||||
"search/aggregation/250_moving_fn[2]",
|
||||
# fails by not returning 'search'?
|
||||
"search/320_disallow_queries[2]",
|
||||
"search/40_indices_boost[1]",
|
||||
# ?q= fails
|
||||
"explain/30_query_string[0]",
|
||||
"count/20_query_string[0]",
|
||||
# index template issues
|
||||
"indices/put_template/10_basic[0]",
|
||||
"indices/put_template/10_basic[1]",
|
||||
"indices/put_template/10_basic[2]",
|
||||
"indices/put_template/10_basic[3]",
|
||||
"indices/put_template/10_basic[4]",
|
||||
# depends on order of response JSON which is random
|
||||
"indices/simulate_index_template/10_basic[1]",
|
||||
# body: null? body is {}
|
||||
"indices/simulate_index_template/10_basic[2]",
|
||||
# can't figure out a snapshot issue, so just skipping this pesky test.
|
||||
"snapshot/clone/10_basic[1]",
|
||||
"search/aggregation/250_moving_fn[1]",
|
||||
}
|
||||
|
||||
|
||||
@@ -111,38 +90,6 @@ class YamlRunner:
|
||||
if self._teardown_code:
|
||||
self.run_code(self._teardown_code)
|
||||
|
||||
for repo, definition in (
|
||||
self.client.snapshot.get_repository(repository="_all")
|
||||
).items():
|
||||
snapshots = self.client.snapshot.get(
|
||||
repository=repo, snapshot="_all", ignore=404
|
||||
).get("snapshots", [])
|
||||
for snapshot in snapshots:
|
||||
self.client.snapshot.delete(
|
||||
repository=repo, snapshot=snapshot["snapshot"], ignore=404
|
||||
)
|
||||
self.client.snapshot.delete_repository(repository=repo)
|
||||
|
||||
# stop and remove all ML stuff
|
||||
if self._feature_enabled("ml"):
|
||||
self.client.ml.stop_datafeed(datafeed_id="*", force=True)
|
||||
for feed in (self.client.ml.get_datafeeds(datafeed_id="*"))["datafeeds"]:
|
||||
self.client.ml.delete_datafeed(datafeed_id=feed["datafeed_id"])
|
||||
|
||||
self.client.ml.close_job(job_id="*", force=True)
|
||||
for job in (self.client.ml.get_jobs(job_id="*"))["jobs"]:
|
||||
self.client.ml.delete_job(
|
||||
job_id=job["job_id"], wait_for_completion=True, force=True
|
||||
)
|
||||
|
||||
# stop and remove all Rollup jobs
|
||||
if self._feature_enabled("rollup"):
|
||||
for rollup in (self.client.rollup.get_jobs(id="*"))["jobs"]:
|
||||
self.client.rollup.stop_job(
|
||||
id=rollup["config"]["id"], wait_for_completion=True
|
||||
)
|
||||
self.client.rollup.delete_job(id=rollup["config"]["id"])
|
||||
|
||||
def es_version(self):
|
||||
global ES_VERSION
|
||||
if ES_VERSION is None:
|
||||
|
||||
@@ -0,0 +1,228 @@
|
||||
# Licensed to Elasticsearch B.V. under one or more contributor
|
||||
# license agreements. See the NOTICE file distributed with
|
||||
# this work for additional information regarding copyright
|
||||
# ownership. Elasticsearch B.V. licenses this file to you under
|
||||
# the Apache License, Version 2.0 (the "License"); you may
|
||||
# not use this file except in compliance with the License.
|
||||
# You may obtain a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing,
|
||||
# software distributed under the License is distributed on an
|
||||
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||
# KIND, either express or implied. See the License for the
|
||||
# specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
import os
|
||||
import time
|
||||
from elasticsearch import Elasticsearch, NotFoundError, RequestError
|
||||
|
||||
|
||||
def wipe_cluster(client):
|
||||
"""Wipes a cluster clean between test cases"""
|
||||
close_after_wipe = False
|
||||
try:
|
||||
# If client is async we need to replace the client
|
||||
# with a synchronous one.
|
||||
from elasticsearch import AsyncElasticsearch
|
||||
|
||||
if isinstance(client, AsyncElasticsearch):
|
||||
client = Elasticsearch(client.transport.hosts, verify_certs=False)
|
||||
close_after_wipe = True
|
||||
except ImportError:
|
||||
pass
|
||||
|
||||
is_xpack = os.getenv("TEST_SUITE") == "xpack"
|
||||
if is_xpack:
|
||||
wipe_rollup_jobs(client)
|
||||
wait_for_pending_tasks(client, filter="xpack/rollup/job")
|
||||
wipe_slm_policies(client)
|
||||
|
||||
wipe_snapshots(client)
|
||||
if is_xpack:
|
||||
wipe_data_streams(client)
|
||||
wipe_indices(client)
|
||||
|
||||
if is_xpack:
|
||||
wipe_xpack_templates(client)
|
||||
else:
|
||||
client.indices.delete_template(name="*")
|
||||
client.indices.delete_index_template(name="*")
|
||||
client.cluster.delete_component_template(name="*")
|
||||
|
||||
wipe_cluster_settings(client)
|
||||
|
||||
if is_xpack:
|
||||
wipe_ilm_policies(client)
|
||||
wipe_auto_follow_patterns(client)
|
||||
wipe_tasks(client)
|
||||
|
||||
wait_for_cluster_state_updates_to_finish(client)
|
||||
if close_after_wipe:
|
||||
client.close()
|
||||
|
||||
|
||||
def wipe_cluster_settings(client):
|
||||
settings = client.cluster.get_settings()
|
||||
new_settings = {}
|
||||
for name, value in settings.items():
|
||||
if value:
|
||||
new_settings.setdefault(name, {})
|
||||
for key in name.keys():
|
||||
new_settings[name][key + ".*"] = None
|
||||
if new_settings:
|
||||
client.cluster.put_settings(body=new_settings)
|
||||
|
||||
|
||||
def wipe_rollup_jobs(client):
|
||||
rollup_jobs = client.rollup.get_jobs(id="_all").get("jobs", ())
|
||||
for job in rollup_jobs:
|
||||
job_id = job["config"]["id"]
|
||||
client.rollup.stop_job(id=job_id, wait_for_completion=True, ignore=404)
|
||||
client.rollup.delete_job(id=job_id, ignore=404)
|
||||
|
||||
|
||||
def wipe_snapshots(client):
|
||||
"""Deletes all the snapshots and repositories from the cluster"""
|
||||
repos = client.snapshot.get_repository()
|
||||
for name, repo in repos.items():
|
||||
if repo["type"] == "fs":
|
||||
client.snapshot.delete(
|
||||
repository=name,
|
||||
snapshot="*",
|
||||
ignore=404,
|
||||
)
|
||||
|
||||
client.snapshot.delete_repository(repository=name, ignore=404)
|
||||
|
||||
|
||||
def wipe_data_streams(client):
|
||||
client.indices.delete_data_stream(name="*")
|
||||
|
||||
|
||||
def wipe_indices(client):
|
||||
|
||||
client.indices.delete(
|
||||
index="*",
|
||||
expand_wildcards="all",
|
||||
ignore=404,
|
||||
)
|
||||
|
||||
|
||||
def wipe_xpack_templates(client):
|
||||
templates = [
|
||||
x.strip() for x in client.cat.templates(h="name").split("\n") if x.strip()
|
||||
]
|
||||
for template in templates:
|
||||
if is_xpack_template(template):
|
||||
continue
|
||||
try:
|
||||
client.indices.delete_template(name=template)
|
||||
except NotFoundError as e:
|
||||
if "index_template [%s] missing" % template in str(e.info):
|
||||
client.indices.delete_index_template(name=template)
|
||||
|
||||
# Delete component templates, need to retry because sometimes
|
||||
# indices aren't cleaned up in time before we issue the delete.
|
||||
templates = client.cluster.get_component_template()["component_templates"]
|
||||
templates_to_delete = [
|
||||
template for template in templates if not is_xpack_template(template["name"])
|
||||
]
|
||||
for _ in range(3):
|
||||
for template in list(templates_to_delete):
|
||||
try:
|
||||
|
||||
client.cluster.delete_component_template(
|
||||
name=template["name"],
|
||||
)
|
||||
|
||||
except RequestError:
|
||||
pass
|
||||
else:
|
||||
templates_to_delete.remove(template)
|
||||
|
||||
if not templates_to_delete:
|
||||
break
|
||||
time.sleep(0.01)
|
||||
|
||||
|
||||
def wipe_ilm_policies(client):
|
||||
for policy in client.ilm.get_lifecycle():
|
||||
if policy not in {
|
||||
"ilm-history-ilm-policy",
|
||||
"slm-history-ilm-policy",
|
||||
"watch-history-ilm-policy",
|
||||
"ml-size-based-ilm-policy",
|
||||
"logs",
|
||||
"metrics",
|
||||
}:
|
||||
client.ilm.delete_lifecycle(policy=policy)
|
||||
|
||||
|
||||
def wipe_slm_policies(client):
|
||||
for policy in client.slm.get_lifecycle():
|
||||
client.slm.delete_lifecycle(policy_id=policy["name"])
|
||||
|
||||
|
||||
def wipe_auto_follow_patterns(client):
|
||||
for pattern in client.ccr.get_auto_follow_pattern()["patterns"]:
|
||||
client.ccr.delete_auto_follow_pattern(name=pattern["name"])
|
||||
|
||||
|
||||
def wipe_tasks(client):
|
||||
tasks = client.tasks.list()
|
||||
for node_name, node in tasks.get("node", {}).items():
|
||||
for task_id in node.get("tasks", ()):
|
||||
client.tasks.cancel(task_id=task_id, wait_for_completion=True)
|
||||
|
||||
|
||||
def wait_for_pending_tasks(client, filter, timeout=30):
|
||||
end_time = time.time() + timeout
|
||||
while time.time() < end_time:
|
||||
tasks = client.cat.tasks(detailed=True).split("\n")
|
||||
if not any(filter in task for task in tasks):
|
||||
break
|
||||
|
||||
|
||||
def wait_for_cluster_state_updates_to_finish(client, timeout=30):
|
||||
end_time = time.time() + timeout
|
||||
while time.time() < end_time:
|
||||
if not client.cluster.pending_tasks().get("tasks", ()):
|
||||
break
|
||||
|
||||
|
||||
def is_xpack_template(name):
|
||||
if ".monitoring-" in name:
|
||||
return True
|
||||
if ".watch" in name or ".triggered_watches" in name:
|
||||
return True
|
||||
if ".data-frame-" in name:
|
||||
return True
|
||||
if ".ml-" in name:
|
||||
return True
|
||||
if ".transform-" in name:
|
||||
return True
|
||||
if name in {
|
||||
".watches",
|
||||
"logstash-index-template",
|
||||
".logstash-management",
|
||||
"security_audit_log",
|
||||
".slm-history",
|
||||
".async-search",
|
||||
"saml-service-provider",
|
||||
"ilm-history",
|
||||
"logs",
|
||||
"logs-settings",
|
||||
"logs-mappings",
|
||||
"metrics",
|
||||
"metrics-settings",
|
||||
"metrics-mappings",
|
||||
"synthetics",
|
||||
"synthetics-settings",
|
||||
"synthetics-mappings",
|
||||
".snapshot-blob-cache",
|
||||
}:
|
||||
return True
|
||||
return False
|
||||
Reference in New Issue
Block a user