Skip to content

Commit

Permalink
Fix metadata elapsedTime field
Browse files Browse the repository at this point in the history
Signed-off-by: Raul Sevilla <rsevilla@redhat.com>
  • Loading branch information
rsevilla87 committed Dec 9, 2022
1 parent 6c81881 commit e41b3fd
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 8 deletions.
7 changes: 4 additions & 3 deletions pkg/burner/job.go
Expand Up @@ -105,10 +105,10 @@ func Run(configSpec config.Spec, uuid string, p *prometheus.Prometheus, alertM *
if job.Config.PreLoadImages {
preLoadImages(job)
}
jobList[jobPosition].Start = time.Now().UTC()
prometheusJob := prometheus.Job{
Start: time.Now().UTC(),
Start: jobList[jobPosition].Start,
}
jobList[jobPosition].Start = time.Now().UTC()
log.Infof("Triggering job: %s", job.Config.Name)
measurements.SetJobConfig(&job.Config)
switch job.Config.JobType {
Expand Down Expand Up @@ -143,7 +143,8 @@ func Run(configSpec config.Spec, uuid string, p *prometheus.Prometheus, alertM *
log.Infof("Pausing for %v before finishing job", job.Config.JobPause)
time.Sleep(job.Config.JobPause)
}
prometheusJob.End = time.Now().UTC()
jobList[jobPosition].End = time.Now().UTC()
prometheusJob.End = jobList[jobPosition].End
elapsedTime := prometheusJob.End.Sub(prometheusJob.Start).Seconds()
// Don't append to Prometheus jobList when prometheus it's not initialized
if p != nil {
Expand Down
11 changes: 6 additions & 5 deletions test/run-ocp.sh
Expand Up @@ -3,7 +3,7 @@
trap 'die' ERR

die() {
if [ -n $1 ]; then
if [[ -n $1 ]]; then
echo $1
fi
oc delete ns -l kube-burner-uuid=${UUID} --ignore-not-found
Expand All @@ -20,12 +20,13 @@ kube-burner ocp node-density --pods-per-node=75 --pod-ready-threshold=10s --cont
echo "Running node-density-heavy wrapper"
kube-burner ocp node-density-heavy --pods-per-node=75 ${COMMON_FLAGS} --qps=5 --burst=5
echo "Running cluster-density wrapper"
kube-burner ocp cluster-density --iterations=3 --churn-duration=5m ${COMMON_FLAGS}
kube-burner ocp cluster-density --iterations=3 --churn-duration=2m ${COMMON_FLAGS}
# Disable gc and avoid metric indexing
echo "Running node-density-cni wrapper"
kube-burner ocp node-density-cni --pods-per-node=75 --gc=false --uuid=${UUID}
kube-burner ocp node-density-cni --pods-per-node=75 --gc=false --uuid=${UUID} --alerting=false
oc delete ns -l kube-burner-uuid=${UUID}
rc=$(kube-burner ocp cluster-density --iterations=1 --churn-duration=5m ${COMMON_FLAGS} --timeout=1s)
if [ ${rc} != 2 ]; then
trap - ERR
kube-burner ocp cluster-density --iterations=1 --churn-duration=5m ${COMMON_FLAGS} --timeout=1s
if [ ${?} != 2 ]; then
die "Kube-burner timed out but its exit code was ${rc} != 2"
fi

0 comments on commit e41b3fd

Please sign in to comment.