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

TimeSeries: Include parked executions as waiting executions in calendar #136

Merged
merged 1 commit into from
Aug 1, 2017
Merged

TimeSeries: Include parked executions as waiting executions in calendar #136

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 4 additions & 1 deletion timeseries/src/main/scala/com/criteo/cuttle/timeseries/TimeSeriesApp.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,9 @@ private[timeseries] trait TimeSeriesApp { self: TimeSeriesScheduler =>
}

val allFailing = executor.allFailingExecutions
val allWaitingIds = executor.allRunning
.filter(_.status == ExecutionWaiting)
.map(_.id)

def findAggregationLevel(n: Int,
gridView: TimeSeriesGridView,
Expand Down Expand Up @@ -180,7 +183,7 @@ private[timeseries] trait TimeSeriesApp { self: TimeSeriesScheduler =>
case Running(e) =>
if (allFailing.exists(_.id == e))
"failed"
else if (executor.platforms.exists(_.waiting.exists(_.id == e)))
else if (allWaitingIds.contains(e))
"waiting"
else "running"
case Todo(_) => "todo"
Expand Down