github-mirrors/elasticsearch
1
0
Fork 0
mirror of https://github.com/elastic/elasticsearch.git synced 2025-06-28 17:34:17 -04:00
Code Issues Projects Releases Packages Wiki Activity

[Test] Rework detecting elasticsearch process in docker tests (#128013) (#128103)

Browse source 
* [Test] Rework detecting elasticsearch process in docker tests

This tweaks detecting the elasticsearch process id by using jps instead of ps which has been problematic in the past exceeding available COLUMN sizes due to es commandline invocation getting longer and longer

* Remove few muted tests

* Reuse ps for detecting processes but use pipe to find the right one

jps doesnt work well with different users

* Tweak java command running lookup to work with wolfi

* Cleanup changes

* [CI] Auto commit changes from spotless

---------

Co-authored-by: elasticsearchmachine <infra-root+elasticsearchmachine@elastic.co>
(cherry picked from commit f0d7ec47b5)

# Conflicts:
#	muted-tests.yml
#	qa/packaging/src/test/java/org/elasticsearch/packaging/util/docker/Docker.java
This commit is contained in:
Rene Groeschke 2025-05-16 14:34:34 -07:00 • committed by GitHub
parent 8d458d3476
commit ada7df5088
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

14
qa/packaging/src/test/java/org/elasticsearch/packaging/util/docker/Docker.java
View file

@ -75,6 +75,13 @@ public class Docker {
public static final int STARTUP_SLEEP_INTERVAL_MILLISECONDS = 1000; public static final int STARTUP_SLEEP_INTERVAL_MILLISECONDS = 1000;
public static final int STARTUP_ATTEMPTS_MAX = 30; public static final int STARTUP_ATTEMPTS_MAX = 30;
private static final String ELASTICSEARCH_FULL_CLASSNAME = "org.elasticsearch.bootstrap.Elasticsearch";
private static final String FIND_ELASTICSEARCH_PROCESS = "for pid in $(ps -eo pid,comm | grep java | awk '\\''{print $1}'\\''); "
+ "do cmdline=$(tr \"\\0\" \" \" < /proc/$pid/cmdline 2>/dev/null); [[ $cmdline == *"
+ ELASTICSEARCH_FULL_CLASSNAME
+ "* ]] && echo \"$pid: $cmdline\"; done";
// The length of the command exceeds what we can use for COLUMNS so we use a pipe to detect the process we're looking for
/** /**
* Tracks the currently running Docker image. An earlier implementation used a fixed container name, * Tracks the currently running Docker image. An earlier implementation used a fixed container name,
* but that appeared to cause problems with repeatedly destroying and recreating containers with * but that appeared to cause problems with repeatedly destroying and recreating containers with
@ -185,11 +192,8 @@ public class Docker {
try { try {
// Give the container enough time for security auto-configuration or a chance to crash out // Give the container enough time for security auto-configuration or a chance to crash out
Thread.sleep(STARTUP_SLEEP_INTERVAL_MILLISECONDS); Thread.sleep(STARTUP_SLEEP_INTERVAL_MILLISECONDS);
psOutput = dockerShell.run("bash -c '" + FIND_ELASTICSEARCH_PROCESS + " | wc -l'").stdout();
// Set COLUMNS so that `ps` doesn't truncate its output if (psOutput.contains("1")) {
psOutput = dockerShell.run("bash -c 'COLUMNS=3000 ps ax'").stdout();
if (psOutput.contains("org.elasticsearch.bootstrap.Elasticsearch")) {
isElasticsearchRunning = true; isElasticsearchRunning = true;
break; break;
} }