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

[BT-504] cromwell graceful restarts #6769

Merged
merged 3 commits into from
Jun 9, 2022
Merged

[BT-504] cromwell graceful restarts #6769

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
af18083
implement reversed ordering for start and end keys
mspector May 25, 2022
616b073
add unit test for new timestamp ordering
mspector May 25, 2022
54f8b72
more coverage in unit test
mspector May 25, 2022
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
30 changes: 30 additions & 0 deletions engine/src/test/scala/cromwell/webservice/MetadataBuilderActorSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,6 +227,36 @@ class MetadataBuilderActorSpec extends TestKitSuite with AsyncFlatSpecLike with
)
}


it should "use reverse date ordering (oldest first) for event start and stop values" in {
val eventBuilderList = List(
("start", "1990-12-20T12:30:00.000Z", OffsetDateTime.now),
("start", "1990-12-20T12:30:01.000Z", OffsetDateTime.now.plusSeconds(1)),
("end", "2018-06-02T12:30:00.000Z", OffsetDateTime.now.plusSeconds(2)),
("end", "2018-06-02T12:30:01.000Z", OffsetDateTime.now.plusSeconds(3)),
)
val workflowId = WorkflowId.randomId()
val expectedRes =
s""""calls": {
| "fqn": [{
| "attempt": 1,
| "end": "2018-06-02T12:30:00.000Z",
| "start": "1990-12-20T12:30:00.000Z",
| "shardIndex": -1
| }]
| },
| "id": "$workflowId"""".stripMargin

assertMetadataKeyStructure(
eventList = eventBuilderList,
expectedJson = expectedRes,
workflow = workflowId,
eventMaker = makeCallEvent,
metadataBuilderActorName = "mba-start-end-values",
)
}


it should "build JSON object structure from dotted key syntax" in {
val eventBuilderList = List(
("a:b:c", "abc", OffsetDateTime.now),
Expand Down
13 changes: 11 additions & 2 deletions services/src/main/scala/cromwell/services/metadata/impl/builder/MetadataComponent.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import spray.json._
import scala.collection.immutable.TreeMap
import scala.language.postfixOps
import scala.util.{Random, Try}
import java.time.Instant

object MetadataComponent {
implicit val MetadataComponentMonoid: Monoid[MetadataComponent] = new Monoid[MetadataComponent] {
Expand Down Expand Up @@ -88,8 +89,12 @@ object MetadataComponent {
}

private def customOrdering(event: MetadataEvent): Option[Ordering[MetadataPrimitive]] = event match {
case MetadataEvent(MetadataKey(_, Some(_), key), _, _) if key == CallMetadataKeys.ExecutionStatus => Option(MetadataPrimitive.ExecutionStatusOrdering)
case MetadataEvent(MetadataKey(_, None, key), _, _) if key == WorkflowMetadataKeys.Status => Option(MetadataPrimitive.WorkflowStateOrdering)
case MetadataEvent(MetadataKey(_, Some(_), key), _, _)
if key == CallMetadataKeys.ExecutionStatus => Option(MetadataPrimitive.ExecutionStatusOrdering)
case MetadataEvent(MetadataKey(_, _, key), _, _)
if key == CallMetadataKeys.Start || key == CallMetadataKeys.End => Option(MetadataPrimitive.TimestampOrdering)
case MetadataEvent(MetadataKey(_, None, key), _, _)
if key == WorkflowMetadataKeys.Status => Option(MetadataPrimitive.WorkflowStateOrdering)
case _ => None
}

Expand Down Expand Up @@ -151,6 +156,10 @@ object MetadataPrimitive {
val WorkflowStateOrdering: Ordering[MetadataPrimitive] = Ordering.by { primitive: MetadataPrimitive =>
WorkflowState.withName(primitive.v.value)
}

val TimestampOrdering: Ordering[MetadataPrimitive] = Ordering.by { primitive: MetadataPrimitive =>
Instant.parse(primitive.v.value)
}.reverse
}
case class MetadataPrimitive(v: MetadataValue, customOrdering: Option[Ordering[MetadataPrimitive]] = None) extends MetadataComponent

Expand Down