mergify[bot]
commented
3 months ago Cherry-pick of c50e717c4b7150be855fdd9f033ddb405719bbd0 has failed:
On branch mergify/bp/v25.x/pr-8478
Your branch is up to date with 'origin/v25.x'.
You are currently cherry-picking commit c50e717c.
(fix conflicts and run "git cherry-pick --continue")
(use "git cherry-pick --skip" to skip this patch)
(use "git cherry-pick --abort" to cancel the cherry-pick operation)
Changes to be committed:
modified: ingest/sqs/domain/errors.go
modified: ingest/sqs/domain/ingester.go
new file: ingest/sqs/domain/mocks/block_updates_process_utils_mock.go
new file: ingest/sqs/domain/mocks/grpc_client_mock.go
new file: ingest/sqs/domain/mocks/pool_transformer_mock.go
new file: ingest/sqs/domain/mocks/pools_extractor_mock.go
deleted: ingest/sqs/domain/mocks/sqs_ingester_mock.go
deleted: ingest/sqs/ingester.go
new file: ingest/sqs/service/blockprocessor/block_process_sqs_factory.go
new file: ingest/sqs/service/blockprocessor/block_process_sqs_factory_test.go
new file: ingest/sqs/service/blockprocessor/block_updates_sqs_block_process_strategy.go
new file: ingest/sqs/service/blockprocessor/block_updates_sqs_block_process_strategy_test.go
new file: ingest/sqs/service/blockprocessor/export_test.go
new file: ingest/sqs/service/blockprocessor/full_sqs_block_process_strategy.go
new file: ingest/sqs/service/blockprocessor/full_sqs_block_process_strategy_test.go
new file: ingest/sqs/service/blockprocessor/transform_and_load.go
modified: ingest/sqs/service/export_test.go
modified: ingest/sqs/sqs_config.go
Unmerged paths:
(use "git add <file>..." to mark resolution)
both modified: app/app.go
both modified: ingest/sqs/service/sqs_streaming_service.go
both modified: ingest/sqs/service/sqs_streaming_service_test.go
To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally
Closes: #XXX
What is the purpose of the change
Implements shared abstractions for the SQS ingest. Refactors and tests.
blockUpdatesSQSBlockProcessStrategy- processes only the updates from a block under normal conditions post initial startfullSQSBlockProcessStrategy- processes the full block data. This strategy is used at node start-up or if SQS inges returns error. Such mechanism allows for effectively reingesting the data.Testing
This is an automatic backport of pull request #8478 done by Mergify.