-
Notifications
You must be signed in to change notification settings - Fork 24.7k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
EQL: [Tests] enable server side debugging #64308
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,101 @@ | ||
/* | ||
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
* or more contributor license agreements. Licensed under the Elastic License; | ||
* you may not use this file except in compliance with the Elastic License. | ||
*/ | ||
|
||
package org.elasticsearch.xpack.eql; | ||
|
||
import org.apache.http.HttpHost; | ||
import org.apache.logging.log4j.core.config.plugins.util.PluginManager; | ||
import org.elasticsearch.action.admin.cluster.repositories.put.PutRepositoryRequest; | ||
import org.elasticsearch.action.admin.cluster.snapshots.restore.RestoreSnapshotRequest; | ||
import org.elasticsearch.action.admin.cluster.snapshots.restore.RestoreSnapshotResponse; | ||
import org.elasticsearch.client.Request; | ||
import org.elasticsearch.client.RequestOptions; | ||
import org.elasticsearch.client.RestClient; | ||
import org.elasticsearch.client.RestHighLevelClient; | ||
import org.elasticsearch.client.core.CountRequest; | ||
import org.elasticsearch.common.logging.LogConfigurator; | ||
import org.elasticsearch.common.settings.Settings; | ||
|
||
import java.io.IOException; | ||
import java.io.InputStream; | ||
import java.util.List; | ||
import java.util.Properties; | ||
|
||
import static org.elasticsearch.test.ESTestCase.assertEquals; | ||
|
||
public class EqlDataLoader { | ||
|
||
private static final String PROPERTIES_FILENAME = "config.properties"; | ||
|
||
public static void main(String[] args) throws IOException { | ||
// Need to setup the log configuration properly to avoid messages when creating a new RestClient | ||
PluginManager.addPackage(LogConfigurator.class.getPackage().getName()); | ||
|
||
try ( | ||
RestClient client = RestClient.builder(new HttpHost("localhost", 9200)) | ||
.setRequestConfigCallback( | ||
requestConfigBuilder -> requestConfigBuilder.setConnectTimeout(30000000) | ||
.setConnectionRequestTimeout(30000000) | ||
.setSocketTimeout(30000000) | ||
) | ||
.setStrictDeprecationMode(true) | ||
.build() | ||
) { | ||
Properties configuration = loadConfiguration(); | ||
restoreSnapshot(new RestHighLevelClient(client, ignore -> {}, List.of()) { | ||
}, configuration); | ||
} | ||
} | ||
|
||
static Properties loadConfiguration() throws IOException { | ||
try (InputStream is = EqlDataLoader.class.getClassLoader().getResourceAsStream(PROPERTIES_FILENAME)) { | ||
Properties props = new Properties(); | ||
props.load(is); | ||
return props; | ||
} | ||
} | ||
|
||
static void restoreSnapshot(RestHighLevelClient restHighLevelClient, Properties cfg) throws IOException { | ||
if (restHighLevelClient.getLowLevelClient() | ||
.performRequest(new Request("HEAD", "/" + cfg.getProperty("index_name"))) | ||
.getStatusLine() | ||
.getStatusCode() == 404) { | ||
restHighLevelClient.snapshot() | ||
.createRepository( | ||
new PutRepositoryRequest(cfg.getProperty("gcs_repo_name")).type("gcs") | ||
.settings( | ||
Settings.builder() | ||
.put("bucket", cfg.getProperty("gcs_bucket_name")) | ||
.put("base_path", cfg.getProperty("gcs_base_path")) | ||
.put("client", cfg.getProperty("gcs_client_name")) | ||
.build() | ||
), | ||
RequestOptions.DEFAULT | ||
); | ||
RestoreSnapshotResponse resp = restHighLevelClient.snapshot() | ||
.restore( | ||
new RestoreSnapshotRequest(cfg.getProperty("gcs_repo_name"), cfg.getProperty("gcs_snapshot_name")).waitForCompletion( | ||
true | ||
), | ||
RequestOptions.DEFAULT | ||
); | ||
|
||
assertEquals( | ||
"Unable to restore snapshot: " | ||
+ resp.getRestoreInfo().toString() | ||
+ System.lineSeparator() | ||
+ "Please check server logs to find the underlying issue.", | ||
1, | ||
resp.getRestoreInfo().successfulShards() | ||
); | ||
|
||
assertEquals( | ||
Long.parseLong(cfg.getProperty("index_doc_count")), | ||
restHighLevelClient.count(new CountRequest(cfg.getProperty("index_name")), RequestOptions.DEFAULT).getCount() | ||
); | ||
} | ||
} | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -12,12 +12,8 @@ | |
import org.apache.logging.log4j.LogManager; | ||
import org.apache.logging.log4j.Logger; | ||
import org.apache.lucene.util.TimeUnits; | ||
import org.elasticsearch.action.admin.cluster.repositories.put.PutRepositoryRequest; | ||
import org.elasticsearch.action.admin.cluster.snapshots.restore.RestoreSnapshotRequest; | ||
import org.elasticsearch.client.HttpAsyncResponseConsumerFactory; | ||
import org.elasticsearch.client.Request; | ||
import org.elasticsearch.client.RequestOptions; | ||
import org.elasticsearch.client.ResponseException; | ||
import org.elasticsearch.client.RestClient; | ||
import org.elasticsearch.client.RestClientBuilder; | ||
import org.elasticsearch.client.RestHighLevelClient; | ||
|
@@ -47,7 +43,6 @@ public class EsEQLCorrectnessIT extends ESRestTestCase { | |
|
||
private static final String PARAM_FORMATTING = "%1$s"; | ||
private static final String QUERIES_FILENAME = "queries.toml"; | ||
private static final String PROPERTIES_FILENAME = "config.properties"; | ||
|
||
private static Properties CFG; | ||
private static RestHighLevelClient highLevelClient; | ||
|
@@ -58,10 +53,7 @@ public class EsEQLCorrectnessIT extends ESRestTestCase { | |
|
||
@BeforeClass | ||
public static void init() throws IOException { | ||
try (InputStream is = EsEQLCorrectnessIT.class.getClassLoader().getResourceAsStream(PROPERTIES_FILENAME)) { | ||
CFG = new Properties(); | ||
CFG.load(is); | ||
} | ||
CFG = EqlDataLoader.loadConfiguration(); | ||
|
||
RequestOptions.Builder builder = RequestOptions.DEFAULT.toBuilder(); | ||
builder.setHttpAsyncResponseConsumerFactory( | ||
|
@@ -72,27 +64,7 @@ public static void init() throws IOException { | |
|
||
@Before | ||
public void restoreDataFromGcsRepo() throws Exception { | ||
if (client().performRequest(new Request("HEAD", "/" + CFG.getProperty("index_name"))).getStatusLine().getStatusCode() == 404) { | ||
highLevelClient().snapshot() | ||
.createRepository( | ||
new PutRepositoryRequest(CFG.getProperty("gcs_repo_name")).type("gcs") | ||
.settings( | ||
Settings.builder() | ||
.put("bucket", CFG.getProperty("gcs_bucket_name")) | ||
.put("base_path", CFG.getProperty("gcs_base_path")) | ||
.put("client", CFG.getProperty("gcs_client_name")) | ||
.build() | ||
), | ||
RequestOptions.DEFAULT | ||
); | ||
highLevelClient().snapshot() | ||
.restore( | ||
new RestoreSnapshotRequest(CFG.getProperty("gcs_repo_name"), CFG.getProperty("gcs_snapshot_name")).waitForCompletion( | ||
true | ||
), | ||
RequestOptions.DEFAULT | ||
); | ||
} | ||
EqlDataLoader.restoreSnapshot(highLevelClient(), CFG); | ||
} | ||
|
||
@After | ||
|
@@ -105,18 +77,6 @@ public static void logTotalExecutionTime() { | |
LOGGER.info("Total time: {} ms", totalTime); | ||
} | ||
|
||
@AfterClass | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Why removing this method? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Because when you have a running ES node and you try to execute a single query against it with gradle, the termination of the suite will delete the data, and you'd have to rerun the EqlDataLoader. |
||
public static void wipeTestData() throws IOException { | ||
try { | ||
adminClient().performRequest(new Request("DELETE", "/*")); | ||
} catch (ResponseException e) { | ||
// 404 here just means we had no indexes | ||
if (e.getResponse().getStatusLine().getStatusCode() != 404) { | ||
throw e; | ||
} | ||
} | ||
} | ||
|
||
@Override | ||
protected boolean preserveClusterUponCompletion() { | ||
// Need to preserve data between parameterized tests runs | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -5,10 +5,11 @@ | |
# | ||
|
||
index_name=mitre | ||
index_doc_count=3950632 | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 👍 |
||
fetch_size=1000 | ||
size=2000 | ||
gcs_repo_name=eql_correctness_gcs_repo | ||
gcs_snapshot_name=mitre-snapshot_7.10 | ||
gcs_bucket_name=matriv-gcs | ||
gcs_base_path=mitre-data | ||
gcs_snapshot_name=correctness-snapshot_es7.10_lucene8.6.3 | ||
gcs_bucket_name=eql-gcs | ||
gcs_base_path=correctness-data | ||
gcs_client_name=eql_test |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
👍 LGTM