Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Issue/jperf 188 improve error logging #87

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Issue/jperf 188 improve error logging #87

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e0c6c0a
JPERF-188: Improve stopJira to wait for Jira process to shutdown inst…
konradmars Feb 19, 2020
e696a72
JPERF-188: Use ps command which displays more informantion in case of…
konradmars Feb 25, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ Dropping a requirement of a major version of a dependency is a new contract.
- Dial down the provisioning logging amount.
- Enrich the provisioning logging messages.
- Fix `UriJiraFormula` failing to download results due to zero nodes and zero threads.
- Improve `stopJira` to wait only for Jira process shutdown instead of all Java processes

[JPERF-595]: https://ecosystem.atlassian.net/browse/JPERF-595

Expand Down
6 changes: 4 additions & 2 deletions src/main/kotlin/com/atlassian/performance/tools/awsinfrastructure/api/CustomDatasetSource.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,10 @@ class CustomDatasetSource(

private fun stopJira(host: SshHost) {
val shutdownTomcat = "echo SHUTDOWN | nc localhost 8005"
val waitForNoJavaProcess = "while ps -C java -o pid=; do sleep 5; done"
Ssh(host, connectivityPatience = 4).newConnection().use { it.safeExecute("$shutdownTomcat && $waitForNoJavaProcess", Duration.ofMinutes(3)) }
val waitForNoJiraProcess = "while ps aux | egrep \"[org].apache.catalina.startup.Bootstrap start\"; do sleep 5; done"
Ssh(host, connectivityPatience = 4).newConnection().use {
it.safeExecute("$shutdownTomcat && $waitForNoJiraProcess", Duration.ofMinutes(3))
}
}

private fun stopDockerContainers(host: SshHost) {
Expand Down