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

feat: delete queues cleanup #100

Merged
merged 7 commits into from
Mar 1, 2023
Merged

feat: delete queues cleanup #100

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
35f68b7
feat: adding cleanup polling job
fernando-a-marins Feb 14, 2023
755e274
chore: fix codacy issues
fernando-a-marins Feb 14, 2023
7607839
chore: resolving some pull request conversations
fernando-a-marins Feb 22, 2023
3b3bd10
chore: resolving some pull request conversations
fernando-a-marins Feb 23, 2023
65b3def
chore: adding missing guards
fernando-a-marins Feb 23, 2023
4a9f51a
chore: removing unnecessary adapter from retry durable job
fernando-a-marins Feb 23, 2023
cb02673
chore: adding missing await to async call
fernando-a-marins Feb 28, 2023
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
41 changes: 29 additions & 12 deletions samples/KafkaFlow.Retry.Sample/Helpers/KafkaClusterConfigurationBuilderHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,13 +74,23 @@ internal static IClusterConfigurationBuilder SetupRetryDurableMongoDb(
)
.Enabled(true)
)
.WithQueuePollingJobConfiguration(
.WithPollingJobsConfiguration(
configure => configure
.WithId("retry-durable-mongodb-polling-id")
.WithCronExpression("0 0/1 * 1/1 * ? *")
.WithExpirationIntervalFactor(1)
.WithFetchSize(10)
.Enabled(true)
.WithSchedulerId("retry-durable-mongodb-polling-id")
fernando-a-marins marked this conversation as resolved.
Show resolved Hide resolved
.WithRetryDurablePollingConfiguration(
configure => configure
.WithCronExpression("0 0/1 * 1/1 * ? *")
.WithExpirationIntervalFactor(1)
.WithFetchSize(10)
.Enabled(true)
)
.WithCleanupPollingConfiguration(
configure => configure
.WithCronExpression("0 0 * 1/1 * ? *")
.WithRowsPerRequest(1048)
.WithTimeToLiveInDays(60)
.Enabled(true)
)
))
.AddTypedHandlers(
handlers => handlers
Expand Down Expand Up @@ -150,13 +160,20 @@ internal static IClusterConfigurationBuilder SetupRetryDurableSqlServer(
)
.Enabled(true)
)
.WithQueuePollingJobConfiguration(
.WithPollingJobsConfiguration(
configure => configure
.WithId("retry-durable-sqlserver-polling-id")
.WithCronExpression("0 0/1 * 1/1 * ? *")
.WithExpirationIntervalFactor(1)
.WithFetchSize(10)
.Enabled(true)
.WithSchedulerId("retry-durable-sqlserver-polling-id")
.WithRetryDurablePollingConfiguration(
configure => configure
.WithCronExpression("0 0/1 * 1/1 * ? *")
.WithExpirationIntervalFactor(1)
.WithFetchSize(10)
.Enabled(true)
)
.WithCleanupPollingConfiguration(
configure => configure
.Enabled(false)
)
))
.AddTypedHandlers(
handlers => handlers
Expand Down
15 changes: 9 additions & 6 deletions ...s/KafkaFlow.Retry.SchemaRegistry.Sample/Helpers/KafkaClusterConfigurationBuilderHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,13 +84,16 @@ internal static IClusterConfigurationBuilder SetupRetryDurableMongoAvroDb(
)
.Enabled(true)
)
.WithQueuePollingJobConfiguration(
.WithPollingJobsConfiguration(
configure => configure
.WithId("retry-durable-mongodb-avro-polling-id")
.WithCronExpression("0 0/1 * 1/1 * ? *")
.WithExpirationIntervalFactor(1)
.WithFetchSize(10)
.Enabled(true)
.WithSchedulerId("retry-durable-mongodb-avro-polling-id")
.WithRetryDurablePollingConfiguration(
configure => configure
.WithCronExpression("0 0/1 * 1/1 * ? *")
.WithExpirationIntervalFactor(1)
.WithFetchSize(10)
.Enabled(true)
)
))
.AddTypedHandlers(
handlers => handlers
Expand Down
61 changes: 37 additions & 24 deletions src/KafkaFlow.Retry.IntegrationTests/Core/Bootstrappers/BootstrapperKafka.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,13 +89,16 @@ internal static IClusterConfigurationBuilder SetupRetryDurableGuaranteeOrderedCo
handlers => handlers
.WithHandlerLifetime(InstanceLifetime.Transient)
.AddHandler<RetryDurableTestMessageHandler>()))
.WithQueuePollingJobConfiguration(
.WithPollingJobsConfiguration(
configure => configure
.Enabled(true)
.WithId("custom_search_key_durable_guarantee_ordered_consumption_mongo_db")
.WithCronExpression("0/30 * * ? * * *")
.WithExpirationIntervalFactor(1)
.WithFetchSize(256))
.WithSchedulerId("custom_search_key_durable_guarantee_ordered_consumption_mongo_db")
.WithRetryDurablePollingConfiguration(
configure => configure
.Enabled(true)
.WithCronExpression("0/30 * * ? * * *")
.WithExpirationIntervalFactor(1)
.WithFetchSize(256))
)
.WithMongoDbDataProvider(
mongoDbConnectionString,
mongoDbDatabaseName,
Expand Down Expand Up @@ -162,13 +165,16 @@ internal static IClusterConfigurationBuilder SetupRetryDurableGuaranteeOrderedCo
handlers => handlers
.WithHandlerLifetime(InstanceLifetime.Transient)
.AddHandler<RetryDurableTestMessageHandler>()))
.WithQueuePollingJobConfiguration(
.WithPollingJobsConfiguration(
configure => configure
.Enabled(true)
.WithId("custom_search_key_durable_guarantee_ordered_consumption_sql_server")
.WithCronExpression("0/30 * * ? * * *")
.WithExpirationIntervalFactor(1)
.WithFetchSize(256))
.WithSchedulerId("custom_search_key_durable_guarantee_ordered_consumption_sql_server")
.WithRetryDurablePollingConfiguration(
configure => configure
.Enabled(true)
.WithCronExpression("0/30 * * ? * * *")
.WithExpirationIntervalFactor(1)
.WithFetchSize(256))
)
.WithSqlServerDataProvider(
sqlServerConnectionString,
sqlServerDatabaseName)
Expand Down Expand Up @@ -235,13 +241,16 @@ internal static IClusterConfigurationBuilder SetupRetryDurableLatestConsumptionM
handlers => handlers
.WithHandlerLifetime(InstanceLifetime.Transient)
.AddHandler<RetryDurableTestMessageHandler>()))
.WithQueuePollingJobConfiguration(
.WithPollingJobsConfiguration(
configure => configure
.Enabled(true)
.WithId("custom_search_key_durable_latest_consumption_mongo_db")
.WithCronExpression("0/30 * * ? * * *")
.WithExpirationIntervalFactor(1)
.WithFetchSize(256))
.WithSchedulerId("custom_search_key_durable_latest_consumption_mongo_db")
.WithRetryDurablePollingConfiguration(
configure => configure
.Enabled(true)
.WithCronExpression("0/30 * * ? * * *")
.WithExpirationIntervalFactor(1)
.WithFetchSize(256))
)
.WithMongoDbDataProvider(
mongoDbConnectionString,
mongoDbDatabaseName,
Expand Down Expand Up @@ -308,13 +317,17 @@ internal static IClusterConfigurationBuilder SetupRetryDurableLatestConsumptionS
handlers => handlers
.WithHandlerLifetime(InstanceLifetime.Transient)
.AddHandler<RetryDurableTestMessageHandler>()))
.WithQueuePollingJobConfiguration(
.WithPollingJobsConfiguration(
configure => configure
.Enabled(true)
.WithId("custom_search_key_durable_latest_consumption_sql_server")
.WithCronExpression("0/30 * * ? * * *")
.WithExpirationIntervalFactor(1)
.WithFetchSize(256))
.WithSchedulerId("custom_search_key_durable_latest_consumption_sql_server")
.WithRetryDurablePollingConfiguration(
configure => configure
.Enabled(true)
.WithCronExpression("0/30 * * ? * * *")
.WithExpirationIntervalFactor(1)
.WithFetchSize(256))
)

.WithSqlServerDataProvider(
sqlServerConnectionString,
sqlServerDatabaseName)
Expand Down
3 changes: 1 addition & 2 deletions src/KafkaFlow.Retry.IntegrationTests/Core/Storages/Repositories/SqlServerRepository.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,8 +98,7 @@ public async Task CreateQueueAsync(RetryQueue queue)
DomainRetryQueueId = queue.Id,
Status = item.Status,
SeverityLevel = item.SeverityLevel,
Description = item.Description,
Sort = item.Sort // TODO: FIX-30: remove this after fix https://github.com/Farfetch/kafkaflow-retry-extensions/issues/30
Description = item.Description
};

var itemId = await this.retryQueueItemRepository.AddAsync(dbConnection, itemDbo);
Expand Down
Loading