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

Stop prometheus in doctest build.gradle now runs upon project failure in startOpenSearch #1747

Merged
merged 3 commits into from
Jun 21, 2023
Merged

Stop prometheus in doctest build.gradle now runs upon project failure in startOpenSearch #1747

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6f2e2da
Stop prometheus now runs when project start fails :)
MitchellGale Jun 15, 2023
7de928c
Bump bwc opensearch version to 2.9
Jun 14, 2023
07f6a8a
Merge pull request #276 from Bit-Quill/dev/FixPrometheusN
MitchellGale Jun 15, 2023
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
29 changes: 9 additions & 20 deletions doctest/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
* SPDX-License-Identifier: Apache-2.0
*/

import java.util.concurrent.Callable
import org.opensearch.gradle.testclusters.RunTask

plugins {
Expand Down Expand Up @@ -51,7 +50,7 @@ task startPrometheus(type: SpawnProcessTask) {
}
command "$projectDir/bin/prometheus/prometheus --storage.tsdb.path=$projectDir/bin/prometheus/data --config.file=$projectDir/bin/prometheus/prometheus.yml"
ready 'TSDB started'
pidLockFileName '.prom.pid.lock'
pidLockFileName ".prom.pid.lock"
}

//evaluationDependsOn(':')
Expand All @@ -78,36 +77,26 @@ task doctest(type: Exec, dependsOn: ['bootstrap']) {

task stopOpenSearch(type: KillProcessTask)

task stopPrometheus() {

task stopPrometheus(type: KillProcessTask) {
pidLockFileName ".prom.pid.lock"
doLast {
def pidFile = new File(path, ".prom.pid.lock")
if (!pidFile.exists()) {
logger.quiet "No Prometheus server running!"
return
}

def pid = pidFile.text
def process = "kill $pid".execute()

try {
process.waitFor()
} finally {
pidFile.delete()
file("$projectDir/bin/prometheus").deleteDir()
file("$projectDir/bin/prometheus.tar.gz").delete()
}
file("$projectDir/bin/prometheus").deleteDir()
file("$projectDir/bin/prometheus.tar.gz").delete()
}
}

// Stop Prom AFTER Start Prom...
if(getOSFamilyType() != "windows") {
stopPrometheus.mustRunAfter startPrometheus
startOpenSearch.dependsOn startPrometheus
stopOpenSearch.finalizedBy stopPrometheus
startOpenSearch.finalizedBy stopPrometheus
}
doctest.dependsOn startOpenSearch
doctest.finalizedBy stopOpenSearch
check.dependsOn doctest
clean.dependsOn(cleanBootstrap)
clean.dependsOn(stopPrometheus)

// 2.0.0-alpha1-SNAPSHOT -> 2.0.0.0-alpha1-SNAPSHOT
String opensearch_no_snapshot = opensearch_version.replace('-SNAPSHOT', '')
Expand Down