Skip to content

Commit

Permalink
WFLY-16392 Drop ZeroToNegativeOneParameterCorrector and fix attribute…
Browse files Browse the repository at this point in the history 
… definitions for flush-wait, node-timeout, smax, ttl, and worker-timeout
  • Loading branch information
@rhusar
rhusar committed Jun 2, 2022
1 parent 34399f7 commit db4cd97
Show file tree
Hide file tree
Showing 3 changed files with 36 additions and 79 deletions.
28 changes: 12 additions & 16 deletions ...src/main/java/org/wildfly/extension/mod_cluster/ProxyConfigurationResourceDefinition.java
View file
Expand Up @@ -104,13 +104,12 @@ public SimpleAttributeDefinitionBuilder apply(SimpleAttributeDefinitionBuilder b
BALANCER("balancer", ModelType.STRING, null),
EXCLUDED_CONTEXTS("excluded-contexts", ModelType.STRING, null),
FLUSH_PACKETS("flush-packets", ModelType.BOOLEAN, ModelNode.FALSE),
FLUSH_WAIT("flush-wait", ModelType.INT, new ModelNode(-1)) {
FLUSH_WAIT("flush-wait", ModelType.INT, null) {
@Override
public SimpleAttributeDefinitionBuilder apply(SimpleAttributeDefinitionBuilder builder) {
return builder
.setMeasurementUnit(MeasurementUnit.SECONDS)
.setValidator(new IntRangeValidator(-1, true, true))
.setCorrector(ZeroToNegativeOneParameterCorrector.INSTANCE)
.setValidator(new IntRangeValidator(1, true, true))
;
}
},
Expand Down Expand Up @@ -138,13 +137,12 @@ public ModelNode correct(ModelNode newValue, ModelNode currentValue) {
;
}
},
NODE_TIMEOUT("node-timeout", ModelType.INT, new ModelNode(-1)) {
NODE_TIMEOUT("node-timeout", ModelType.INT, null) {
@Override
public SimpleAttributeDefinitionBuilder apply(SimpleAttributeDefinitionBuilder builder) {
return builder
.setMeasurementUnit(MeasurementUnit.SECONDS)
.setValidator(new IntRangeValidator(-1, true, true))
.setCorrector(ZeroToNegativeOneParameterCorrector.INSTANCE)
.setValidator(new IntRangeValidator(1, true, true))
;
}
},
Expand All @@ -169,12 +167,11 @@ public SimpleAttributeDefinitionBuilder apply(SimpleAttributeDefinitionBuilder b
return builder.setValidator(new EnumValidator<>(SessionDrainingStrategyEnum.class, SessionDrainingStrategyEnum.values()));
}
},
SMAX("smax", ModelType.INT, new ModelNode(-1)) {
SMAX("smax", ModelType.INT, null) {
@Override
public SimpleAttributeDefinitionBuilder apply(SimpleAttributeDefinitionBuilder builder) {
return builder
.setValidator(new IntRangeValidator(-1, true, true))
.setCorrector(ZeroToNegativeOneParameterCorrector.INSTANCE)
.setValidator(new IntRangeValidator(1, true, true))
;
}
},
Expand All @@ -198,7 +195,8 @@ public SimpleAttributeDefinitionBuilder apply(SimpleAttributeDefinitionBuilder b
STATUS_INTERVAL("status-interval", ModelType.INT, new ModelNode(10)) {
@Override
public SimpleAttributeDefinitionBuilder apply(SimpleAttributeDefinitionBuilder builder) {
return builder.setMeasurementUnit(MeasurementUnit.SECONDS)
return builder
.setMeasurementUnit(MeasurementUnit.SECONDS)
.setValidator(new IntRangeValidator(1, true, true));
}
},
Expand All @@ -212,23 +210,21 @@ public SimpleAttributeDefinitionBuilder apply(SimpleAttributeDefinitionBuilder b
.setValidator(new IntRangeValidator(1, true, true));
}
},
TTL("ttl", ModelType.INT, new ModelNode(-1)) {
TTL("ttl", ModelType.INT, null) {
@Override
public SimpleAttributeDefinitionBuilder apply(SimpleAttributeDefinitionBuilder builder) {
return builder
.setMeasurementUnit(MeasurementUnit.SECONDS)
.setValidator(new IntRangeValidator(-1, true, true))
.setCorrector(ZeroToNegativeOneParameterCorrector.INSTANCE)
.setValidator(new IntRangeValidator(1, true, true))
;
}
},
WORKER_TIMEOUT("worker-timeout", ModelType.INT, new ModelNode(-1)) {
WORKER_TIMEOUT("worker-timeout", ModelType.INT, null) {
@Override
public SimpleAttributeDefinitionBuilder apply(SimpleAttributeDefinitionBuilder builder) {
return builder
.setMeasurementUnit(MeasurementUnit.SECONDS)
.setValidator(new IntRangeValidator(-1, true, true))
.setCorrector(ZeroToNegativeOneParameterCorrector.INSTANCE)
.setValidator(new IntRangeValidator(1, true, true))
;
}
},
Expand Down
31 changes: 24 additions & 7 deletions ...rc/main/java/org/wildfly/extension/mod_cluster/ProxyConfigurationServiceConfigurator.java
View file
Expand Up @@ -94,7 +94,7 @@
/**
* @author Radoslav Husar
*/
public class ProxyConfigurationServiceConfigurator extends CapabilityServiceNameProvider implements ResourceServiceConfigurator, Supplier<ModClusterConfiguration>, Consumer<ModClusterConfiguration> {
public class ProxyConfigurationServiceConfigurator extends CapabilityServiceNameProvider implements ResourceServiceConfigurator, Supplier<ModClusterConfiguration>, Consumer<ModClusterConfiguration> {

private volatile SupplierDependency<SocketBinding> advertiseSocketDependency = null;
private final List<SupplierDependency<OutboundSocketBinding>> outboundSocketBindings = new LinkedList<>();
Expand Down Expand Up @@ -188,21 +188,38 @@ public ServiceConfigurator configure(OperationContext context, ModelNode model)
.setStickySession(STICKY_SESSION.resolveModelAttribute(context, model).asBoolean())
.setStickySessionRemove(STICKY_SESSION_REMOVE.resolveModelAttribute(context, model).asBoolean())
.setStickySessionForce(STICKY_SESSION_FORCE.resolveModelAttribute(context, model).asBoolean())
.setWorkerTimeout(WORKER_TIMEOUT.resolveModelAttribute(context, model).asInt())
.setMaxAttempts(MAX_ATTEMPTS.resolveModelAttribute(context, model).asInt())
;

ModelNode node = WORKER_TIMEOUT.resolveModelAttribute(context, model);
if (node.isDefined()) {
builder.balancer().setWorkerTimeout(node.asInt());
}

// Node

builder.node()
.setFlushPackets(FLUSH_PACKETS.resolveModelAttribute(context, model).asBoolean())
.setFlushWait(FLUSH_WAIT.resolveModelAttribute(context, model).asInt())
.setPing(PING.resolveModelAttribute(context, model).asInt())
.setSmax(SMAX.resolveModelAttribute(context, model).asInt())
.setTtl(TTL.resolveModelAttribute(context, model).asInt())
.setNodeTimeout(NODE_TIMEOUT.resolveModelAttribute(context, model).asInt())
;
ModelNode node = BALANCER.resolveModelAttribute(context, model);

node = FLUSH_WAIT.resolveModelAttribute(context, model);
if (node.isDefined()) {
builder.node().setFlushWait(node.asInt());
}
node = SMAX.resolveModelAttribute(context, model);
if (node.isDefined()) {
builder.node().setSmax(node.asInt());
}
node = TTL.resolveModelAttribute(context, model);
if (node.isDefined()) {
builder.node().setTtl(node.asInt());
}
node = NODE_TIMEOUT.resolveModelAttribute(context, model);
if (node.isDefined()) {
builder.node().setNodeTimeout(node.asInt());
}
node = BALANCER.resolveModelAttribute(context, model);
if (node.isDefined()) {
builder.node().setBalancer(node.asString());
}
Expand Down
56 changes: 0 additions & 56 deletions .../src/main/java/org/wildfly/extension/mod_cluster/ZeroToNegativeOneParameterCorrector.java
View file

This file was deleted.

0 comments on commit db4cd97

Please sign in to comment.