SKYEDEN-3271 | consumer group cleanup #1933
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| package pl.allegro.tech.hermes.management.config.subscription.consumergroup; | ||
|
|
||
| import java.time.Clock; | ||
| import org.springframework.beans.factory.annotation.Autowired; | ||
| import org.springframework.boot.context.properties.EnableConfigurationProperties; | ||
| import org.springframework.context.annotation.Bean; | ||
| import org.springframework.context.annotation.Configuration; | ||
| import pl.allegro.tech.hermes.management.domain.subscription.SubscriptionService; | ||
| import pl.allegro.tech.hermes.management.domain.subscription.consumergroup.ConsumerGroupCleanUpScheduler; | ||
| import pl.allegro.tech.hermes.management.domain.subscription.consumergroup.ConsumerGroupToDeleteRepository; | ||
| import pl.allegro.tech.hermes.management.infrastructure.kafka.MultiDCAwareService; | ||
| import pl.allegro.tech.hermes.management.infrastructure.leader.ManagementLeadership; | ||
| import pl.allegro.tech.hermes.management.infrastructure.zookeeper.ZookeeperRepositoryManager; | ||
|
|
||
| @Configuration | ||
| @EnableConfigurationProperties(ConsumerGroupCleanUpProperties.class) | ||
| public class ConsumerGroupCleanUpConfig { | ||
|
|
||
| @Autowired ZookeeperRepositoryManager zookeeperRepositoryManager; | ||
|
|
||
| @Bean | ||
| ConsumerGroupCleanUpScheduler consumerGroupCleanUpScheduler( | ||
| MultiDCAwareService multiDCAwareService, | ||
| SubscriptionService subscriptionService, | ||
| ConsumerGroupCleanUpProperties properties, | ||
| ManagementLeadership managementLeadership, | ||
| Clock clock) { | ||
| return new ConsumerGroupCleanUpScheduler( | ||
| multiDCAwareService, | ||
| zookeeperRepositoryManager.getRepositoriesByType(ConsumerGroupToDeleteRepository.class), | ||
| subscriptionService, | ||
| properties, | ||
| managementLeadership, | ||
| clock); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,53 @@ | ||
| package pl.allegro.tech.hermes.management.config.subscription.consumergroup; | ||
|
|
||
| import java.time.Duration; | ||
| import org.springframework.boot.context.properties.ConfigurationProperties; | ||
|
|
||
| @ConfigurationProperties(prefix = "consumer-group.clean-up") | ||
| public class ConsumerGroupCleanUpProperties { | ||
| private boolean enabled = true; | ||
| private Duration interval = Duration.ofMinutes(5); | ||
| private Duration initialDelay = Duration.ofMinutes(1); | ||
| private Duration timeout = Duration.ofHours(24); | ||
| private boolean removeTasksAfterTimeout = true; | ||
|
|
||
| public boolean isEnabled() { | ||
| return enabled; | ||
| } | ||
|
|
||
| public void setEnabled(boolean enabled) { | ||
| this.enabled = enabled; | ||
| } | ||
|
|
||
| public Duration getInterval() { | ||
| return interval; | ||
| } | ||
|
|
||
| public void setInterval(Duration interval) { | ||
| this.interval = interval; | ||
| } | ||
|
|
||
| public Duration getInitialDelay() { | ||
| return initialDelay; | ||
| } | ||
|
|
||
| public void setInitialDelay(Duration initialDelay) { | ||
| this.initialDelay = initialDelay; | ||
| } | ||
|
|
||
| public Duration getTimeout() { | ||
| return timeout; | ||
| } | ||
|
|
||
| public void setTimeout(Duration timeout) { | ||
| this.timeout = timeout; | ||
| } | ||
|
|
||
| public void setRemoveTasksAfterTimeout(boolean removeTasksAfterTimeout) { | ||
| this.removeTasksAfterTimeout = removeTasksAfterTimeout; | ||
| } | ||
|
|
||
| public boolean isRemoveTasksAfterTimeout() { | ||
| return removeTasksAfterTimeout; | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| package pl.allegro.tech.hermes.management.domain.subscription.consumergroup; | ||
|
|
||
| import static java.lang.String.format; | ||
|
|
||
| public class ConsumerGroupAlreadyScheduledToDeleteException extends RuntimeException { | ||
|
|
||
| public ConsumerGroupAlreadyScheduledToDeleteException( | ||
| ConsumerGroupToDelete consumerGroupToDelete, Throwable e) { | ||
| super( | ||
| format( | ||
| "Consumer group already scheduled to delete, for subscription %s ", | ||
| consumerGroupToDelete.subscriptionName().getQualifiedName()), | ||
| e); | ||
| } | ||
| } |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
isn't 24h timeout too long? just asking
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this timeout indicates after what period of time it should ignore tthe removal of consumer group.
I might change it to lower value, but i'm wondering as well if your question is not brought from the ambigious naiming of this variable. Maybe i should change it to something like "skipAfter" ?