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

Feature/throttling release #1463

Open
wants to merge 2 commits into
base: release-6.6.0
Choose a base branch
from
+13 −0
Open

Feature/throttling release #1463

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
352e612
Old version permits have no permitRequest object
jboon Nov 19, 2024
84364df
Configurable subscription settings
jboon Nov 21, 2024
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
8 changes: 8 additions & 0 deletions ...ttling-service/src/main/java/org/opensmartgridplatform/throttling/config/RedisConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,12 @@ public class RedisConfig {
@Value("${redis.connection.pool-size:64}")
private int redisConnectionPoolSize;

@Value("${redis.subscription.connection.pool-size:50}")
private int redisSubscriptionConnectionPoolSize;

@Value("${redis.subscriptions.per.connection:5}")
private int redisSubscriptionsPerConnection;

@Bean(destroyMethod = "shutdown")
public RedissonClient redissonClient(final Config redissonConfig) {
this.installJCAProvider();
Expand All @@ -75,6 +81,8 @@ public Config redissonConfig() throws IOException {
singleServerConfig.setPassword(this.password.isEmpty() ? null : this.password);
singleServerConfig.setSslEnableEndpointIdentification(false);
singleServerConfig.setConnectionPoolSize(this.redisConnectionPoolSize);
singleServerConfig.setSubscriptionConnectionPoolSize(this.redisSubscriptionConnectionPoolSize);
singleServerConfig.setSubscriptionsPerConnection(this.redisSubscriptionsPerConnection);

if (this.useSsl) {
singleServerConfig.setAddress(String.format("rediss://%s:%d", this.host, this.port));
Expand Down
3 changes: 3 additions & 0 deletions ...rvice/src/main/java/org/opensmartgridplatform/throttling/services/RedisPermitService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,7 @@ public boolean removePermit(
final boolean released =
permits.stream()
.filter(Objects::nonNull)
.filter(p -> p.permitRequest() != null)
.filter(
p ->
p.permitRequest().getClientId() == permitRequest.getClientId()
Expand Down Expand Up @@ -191,6 +192,7 @@ public Optional<Permit> findByClientIdAndRequestId(final int clientId, final int
.map(this.redisson::getScoredSortedSet)
.flatMap(RScoredSortedSet::stream)
.map(p -> (Permit) p)
.filter(p -> p.permitRequest() != null)
.filter(
p ->
p.permitRequest().getClientId() == clientId
Expand All @@ -208,6 +210,7 @@ public long countByClientId(final int clientId) {
.map(this.redisson::getScoredSortedSet)
.flatMap(RScoredSortedSet::stream)
.map(p -> (Permit) p)
.filter(p -> p.permitRequest() != null)
.filter(p -> p.permitRequest().getClientId() == clientId)
.count();
}
Expand Down
2 changes: 2 additions & 0 deletions osgp/platform/osgp-throttling-service/src/main/resources/osgp-throttling-service.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,3 +50,5 @@ redis.ssl.truststore.password=
redis.password=
redis.protocol=TLSv1.2
redis.connection.pool-size=64
redis.subscription.connection.pool-size=50
redis.subscriptions.per.connection=5
Loading