Repository navigation
Async step timeouts - #1834
Open
vkalapov wants to merge 7 commits into
Open
Async step timeouts#1834vkalapov wants to merge 7 commits into
vkalapov wants to merge 7 commits into
Conversation
vkalapov
force-pushed
the
async-step-timeouts
branch
from
May 18, 2026 09:05
51adc0c to
f3efdb1
Compare
|
|
|
||
| @Override | ||
| public Duration getTimeout(ProcessContext context) { | ||
| return calculateTimeout(context, TimeoutType.BIND_SERVICE); |
Contributor
There was a problem hiding this comment.
why checking a service key operation is using BIND_SERVICE instead of CREATE_SERVICE_KEY
|
|
||
| @Named("globalTimeoutSettingStep") | ||
| @Scope(BeanDefinition.SCOPE_PROTOTYPE) | ||
| public class GlobalTimeoutSettingStep extends SyncFlowableStep { |
Contributor
There was a problem hiding this comment.
Use constructor injection
| return timeoutType.isModuleScoped() ? moduleTimeoutSources : serviceTimeoutSources; | ||
| } | ||
|
|
||
| public DeploymentDescriptor getDeploymentDescriptor(ProcessContext context, StepLogger stepLogger) { |
Contributor
There was a problem hiding this comment.
Why TimeoutValueResolved has a method for getting the DeploymentDescriptor from context. This breaks single responsibility principle
Comment on lines
+58
to
+60
| if (!timeoutType.isServiceScoped()) { | ||
| return false; | ||
| } |
Contributor
There was a problem hiding this comment.
Why is this check needed for?
Comment on lines
+67
to
+68
| String timeoutSeconds = timeout != null ? String.valueOf(timeout.toSeconds()) : "null"; | ||
| getStepLogger().debug(Messages.TIMEOUT_0_EQUALS_1_SECONDS_FROM_2, |
Contributor
There was a problem hiding this comment.
Can we say the parameter is not set instead of logging 'null' strings?
| import org.cloudfoundry.multiapps.mta.model.Resource; | ||
|
|
||
| @Named | ||
| public class TimeoutServiceResourceNameResolver { |
Contributor
There was a problem hiding this comment.
Is this used beyond tests?
Comment on lines
+28
to
+29
| private interface TimeoutSource { | ||
| Optional<TimeoutResolution> resolve(ProcessContext context, TimeoutType timeoutType, StepLogger logger); |
Contributor
There was a problem hiding this comment.
Why TimeoutSource has a resolve method? Rename to some resolver?
| return DurationUtil.parseDuration(timeout, timeoutParameterName, maxAllowedValue); | ||
| } | ||
|
|
||
| private Optional<Module> findModuleByAppName(DeploymentDescriptor descriptor, String appName) { |
Contributor
There was a problem hiding this comment.
The module name and the app-name might not always match. Can we reuse some already existing method util instead of having another similar method?
| public record TimeoutResolution(Duration timeout, String parameterName) { | ||
| } | ||
|
|
||
| private final List<TimeoutSource> moduleTimeoutSources = List.of( |
Contributor
There was a problem hiding this comment.
Isn't the whole logic a bit over engineered with all these lambdas and records?
Comment on lines
+317
to
+319
| .filter(type -> originalParameters.containsKey(type.getProcessVariable() | ||
| .getName())) | ||
| .forEach(type -> targetParameters.put(type.getOperationParamsFlag() |
Contributor
There was a problem hiding this comment.
What is the point of setting these variables to true if they are hardcoded in the enum while their default value is false?
vkalapov
force-pushed
the
async-step-timeouts
branch
from
October 13, 2026 09:04
f3efdb1 to
86d67e4
Compare
Introduce the vocabulary for configurable service operation timeouts: - SupportedParameters: resource-level (create-service-timeout, bind-service-timeout, create-service-key-timeout) and global-level (services-*) parameter names - Variables: the CLI-override process variables and the bind global fallback - CloudServiceInstanceExtended: resource-level timeout fields, populated by ServicesCloudModelBuilder from the service's mtad parameters - DurationUtil: parse and validate raw timeout values into Duration - Constants: fixed ceilings for delete-service, delete-service-key and unbind-service operations
Add the timeout resolution engine: - TimeoutType: declares, per operation, its parameter names, CLI process variable, maximum value, and (for services) how to read the timeout off the service instance - TimeoutValueResolver: resolves a timeout by priority — CLI process variable, then resource/service-object value, then global descriptor parameter, then the default. Bind additionally falls back to a pre-resolved global variable because its subprocess has no descriptor - TimeoutStepStateManager: tracks per-step elapsed time with correct reset semantics across retries and poll cycles
Wire the async steps to the resolver: - TimeoutAsyncFlowableStep: resolve and log the timeout, then enforce it via the step state manager on every execution - Create/Bind/CheckServiceBinding/CheckServiceKey steps resolve their configurable timeout from the resolver - Delete/DeleteServiceKey/Unbind steps adopt a fixed safety ceiling (previously unbounded) - ProcessDescriptorStep pre-resolves the global bind timeout into a process variable for the binding subprocess, which has no descriptor
Register the create-service, bind-service and create-service-key timeout parameters (with their integer conversion) in the deploy, blue-green, CTS and rollback metadata so they are accepted and converted to process variables. Update metadata tests accordingly.
vkalapov
force-pushed
the
async-step-timeouts
branch
2 times, most recently
from
October 14, 2026 11:23
ca7e8a6 to
50270b6
Compare
vkalapov
force-pushed
the
async-step-timeouts
branch
from
October 14, 2026 11:25
50270b6 to
7f1c661
Compare
Yavor16
requested changes
Oct 15, 2026
| return Optional.empty(); | ||
| } | ||
| long seconds = number.longValue(); | ||
| return seconds > 0 ? Optional.of(Duration.ofSeconds(seconds)) : Optional.empty(); |
Contributor
There was a problem hiding this comment.
In the method above we have max value, don't we need here also a max value?
Comment on lines
+1006
to
+1008
| Variable<Duration> BIND_SERVICE_TIMEOUT_GLOBAL_FALLBACK = ImmutableSimpleVariable.<Duration> builder() | ||
| .name("servicesBindServiceTimeoutGlobalFallback") | ||
| .build(); |
Contributor
There was a problem hiding this comment.
Do we need default value for this Variable
|
This branch has not been deployed
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
LMCROSSITXSADEPLOY-3322