Skip to content

Prevent txlog backfill from including ACS imports #2128

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

Open
wants to merge 4 commits into
base: oriol/acs-ingestion-begin
Choose a base branch
from
Open

Prevent txlog backfill from including ACS imports #2128

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
eaca3c8
[ci] i like robert's idea better
OriolMunoz-da Sep 4, 2025
6514dd3
[ci] mpre fix
OriolMunoz-da Sep 4, 2025
68b2429
Merge branch 'oriol/acs-ingestion-begin' into oriol/txlogbackfill-no-…
OriolMunoz-da Oct 1, 2025
c187dbf
[ci] run
OriolMunoz-da Oct 1, 2025
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
87 changes: 49 additions & 38 deletions ...ommon/src/main/scala/org/lfdecentralizedtrust/splice/store/db/DbMultiDomainAcsStore.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -614,47 +614,58 @@ final class DbMultiDomainAcsStore[TXE](
)(implicit
tc: TraceContext
): Future[DestinationHistory.InsertResult] = {
val trees = items.collect { case UpdateHistoryResponse(TransactionTreeUpdate(tree), _) =>
assert(
tree.getRecordTime.isAfter(CantonTimestamp.MinValue.toInstant),
"insert() must not be called with import updates",
)
tree
}
val nonEmpty = NonEmptyList
.fromFoldable(trees)
.getOrElse(
throw new RuntimeException("insert() must not be called with an empty sequence")
)
val firstTree = nonEmpty.foldLeft(nonEmpty.head) { case (acc, tree) =>
if (tree.getRecordTime.isBefore(acc.getRecordTime)) tree else acc
}
val firstRecordTime = CantonTimestamp.assertFromInstant(firstTree.getRecordTime)
val treesWithEntries = trees.flatMap { tree =>
val entries = txLogConfig.parser.parse(tree, synchronizerId, logger)
entries.map(e => (tree, e))
val trees = items.collect {
case UpdateHistoryResponse(TransactionTreeUpdate(tree), _)
if !tree.getWorkflowId.startsWith(IMPORT_ACS_WORKFLOW_ID_PREFIX) =>
assert(
tree.getRecordTime.isAfter(CantonTimestamp.MinValue.toInstant),
"insert() must not be called with import updates",
)
tree
}

for {
_ <- storage.queryAndUpdate(
DBIOAction
.seq(
doInsertEntries(migrationId, synchronizerId, treesWithEntries),
doUpdateFirstIngestedUpdate(
synchronizerId,
migrationId,
firstRecordTime,
),
NonEmptyList.fromFoldable(trees) match {
case None =>
Future.successful(
DestinationHistory.InsertResult(
backfilledUpdates = 0L,
backfilledEvents = 0L,
lastBackfilledRecordTime =
items.headOption.map(_.update.recordTime).getOrElse(CantonTimestamp.MinValue),
)
.transactionally,
"destinationHistory.insert",
)
} yield DestinationHistory.InsertResult(
backfilledUpdates = trees.size.toLong,
backfilledEvents =
trees.foldLeft(0L)((sum, tree) => sum + tree.getEventsById.size().toLong),
lastBackfilledRecordTime = CantonTimestamp.assertFromInstant(nonEmpty.last.getRecordTime),
)
)
Comment on lines +629 to +636
Copy link
Contributor Author

@OriolMunoz-da OriolMunoz-da Sep 4, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

here be dragons, I don't understand why the previous was throwing an exception

case Some(nonEmpty) =>
val firstTree = nonEmpty.foldLeft(nonEmpty.head) { case (acc, tree) =>
if (tree.getRecordTime.isBefore(acc.getRecordTime)) tree else acc
}
val firstRecordTime = CantonTimestamp.assertFromInstant(firstTree.getRecordTime)
val treesWithEntries = trees.flatMap { tree =>
val entries = txLogConfig.parser.parse(tree, synchronizerId, logger)
entries.map(e => (tree, e))
}

for {
_ <- storage.queryAndUpdate(
DBIOAction
.seq(
doInsertEntries(migrationId, synchronizerId, treesWithEntries),
doUpdateFirstIngestedUpdate(
synchronizerId,
migrationId,
firstRecordTime,
),
)
.transactionally,
"destinationHistory.insert",
)
} yield DestinationHistory.InsertResult(
backfilledUpdates = trees.size.toLong,
backfilledEvents =
trees.foldLeft(0L)((sum, tree) => sum + tree.getEventsById.size().toLong),
lastBackfilledRecordTime =
CantonTimestamp.assertFromInstant(nonEmpty.last.getRecordTime),
)
}
}

override def markBackfillingComplete()(implicit tc: TraceContext): Future[Unit] = {
Expand Down
Loading