Skip to content

[ci] Parse offset checkpoint in get update tree response #1053

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

Merged
nicu-da merged 4 commits into from
Jun 10, 2025
Merged

[ci] Parse offset checkpoint in get update tree response #1053

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f1f1d23
[ci] Parse offset checkpoint in get update tree response
nicu-da Jun 10, 2025
01949c7
[ci] fix warning for checkpoints
nicu-da Jun 10, 2025
7989b90
[ci] iffing is hard
nicu-da Jun 10, 2025
c0266a8
[ci] iffing is hard ^2
nicu-da Jun 10, 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
18 changes: 16 additions & 2 deletions .../src/main/scala/org/lfdecentralizedtrust/splice/environment/ledger/api/LedgerClient.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,16 @@ import com.daml.ledger.api.v2.admin.party_management_service.{
}
import com.daml.ledger.api.v2.interactive.interactive_submission_service.InteractiveSubmissionServiceGrpc
import com.daml.ledger.api.v2.command_service.CommandServiceGrpc
import com.daml.ledger.api.v2.offset_checkpoint.OffsetCheckpoint.toJavaProto
import com.daml.ledger.api.v2.package_reference.PackageReference
import com.daml.ledger.api.v2.package_service.{ListPackagesRequest, PackageServiceGrpc}
import com.daml.ledger.javaapi.data.{Command, CreateUserResponse, ListUserRightsResponse, User}
import com.daml.ledger.javaapi.data.{
Command,
CreateUserResponse,
ListUserRightsResponse,
OffsetCheckpoint,
User,
}
import com.daml.ledger.javaapi.data.codegen.ContractId
import com.daml.ledger.javaapi.data.User.Right
import org.lfdecentralizedtrust.splice.auth.AuthToken
Expand Down Expand Up @@ -819,7 +826,14 @@ object LedgerClient {
)
)

case TU.OffsetCheckpoint(_) => None
case TU.OffsetCheckpoint(offset) =>
Some(
GetTreeUpdatesResponse(
TreeUpdateOrOffsetCheckpoint.Checkpoint(
OffsetCheckpoint.fromProto(toJavaProto(offset))
)
)
)

case TU.Empty => sys.error("uninitialized update service result (update)")
}
Expand Down
25 changes: 19 additions & 6 deletions apps/common/src/main/scala/org/lfdecentralizedtrust/splice/store/UpdateHistory.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,12 +321,25 @@ class UpdateHistory(
)
case Some(lastIngestedOffset) =>
if (offset <= lastIngestedOffset) {
logger.warn(
s"Update offset $offset <= last ingested offset $lastIngestedOffset for ${description()}, skipping database actions. " +
"This is expected if the SQL query was automatically retried after a transient database error. " +
"Otherwise, this is unexpected and most likely caused by two identical UpdateIngestionService instances " +
"ingesting into the same logical database."
)
updateOrCheckpoint match {
case _: TreeUpdateOrOffsetCheckpoint.Update =>
logger.warn(
s"Update offset $offset <= last ingested offset $lastIngestedOffset for ${description()}, skipping database actions. " +
"This is expected if the SQL query was automatically retried after a transient database error. " +
"Otherwise, this is unexpected and most likely caused by two identical UpdateIngestionService instances " +
"ingesting into the same logical database."
)
case _: TreeUpdateOrOffsetCheckpoint.Checkpoint =>
// we can receive an offset equal to the last ingested and that can be safely ignore
if (offset < lastIngestedOffset) {
logger.warn(
s"Checkpoint offset $offset < last ingested offset $lastIngestedOffset for ${description()}, skipping database actions. " +
"This is expected if the SQL query was automatically retried after a transient database error. " +
"Otherwise, this is unexpected and most likely caused by two identical UpdateIngestionService instances " +
"ingesting into the same logical database."
)
}
}
DBIO.successful(())
} else {
logger.debug(
Expand Down
24 changes: 17 additions & 7 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 @@ -995,6 +995,7 @@ final class DbMultiDomainAcsStore[TXE](
private def ingestUpdateAtOffset[E <: Effect](
offset: Long,
action: DBIOAction[?, NoStream, Effect.Read & Effect.Write],
isOffsetCheckpoint: Boolean = false,
)(implicit
tc: TraceContext
): DBIOAction[Unit, NoStream, Effect.Read & Effect.Write & Effect.Transactional] = {
Expand All @@ -1004,12 +1005,18 @@ final class DbMultiDomainAcsStore[TXE](
action.andThen(updateOffset(offset))
case Some(lastIngestedOffset) =>
if (offset <= lastIngestedOffset) {
logger.warn(
s"Update offset $offset <= last ingested offset $lastIngestedOffset for DbMultiDomainAcsStore(storeId=$acsStoreId), skipping database actions. " +
"This is expected if the SQL query was automatically retried after a transient database error. " +
"Otherwise, this is unexpected and most likely caused by two identical UpdateIngestionService instances " +
"ingesting into the same logical database."
)
/* we can receive an offset equal to the last ingested and that can be safely ignore */
if (isOffsetCheckpoint) {
if (offset < lastIngestedOffset) {
logger.warn(
s"Checkpoint offset $offset < last ingested offset $lastIngestedOffset for DbMultiDomainAcsStore(storeId=$acsStoreId), skipping database actions. This is expected if the SQL query was automatically retried after a transient database error. Otherwise, this is unexpected and most likely caused by two identical UpdateIngestionService instances ingesting into the same logical database."
)
}
} else {
logger.warn(
s"Update offset $offset <= last ingested offset $lastIngestedOffset for DbMultiDomainAcsStore(storeId=$acsStoreId), skipping database actions. This is expected if the SQL query was automatically retried after a transient database error. Otherwise, this is unexpected and most likely caused by two identical UpdateIngestionService instances ingesting into the same logical database."
)
}
DBIO.successful(())
} else {
action.andThen(updateOffset(offset))
Expand Down Expand Up @@ -1183,7 +1190,10 @@ final class DbMultiDomainAcsStore[TXE](
case TreeUpdateOrOffsetCheckpoint.Checkpoint(checkpoint) =>
val offset = checkpoint.getOffset
storage
.queryAndUpdate(ingestUpdateAtOffset(offset, DBIO.unit), "ingestOffsetCheckpoint")
.queryAndUpdate(
ingestUpdateAtOffset(offset, DBIO.unit, isOffsetCheckpoint = true),
"ingestOffsetCheckpoint",
)
.map { _ =>
state
.getAndUpdate(s => s.withUpdate(s.acsSize, offset))
Expand Down