fix: make rpc_timeout and max_bundle_workers configurable on the agent#7093
Open
salimeid wants to merge 2 commits into
Open
fix: make rpc_timeout and max_bundle_workers configurable on the agent#7093salimeid wants to merge 2 commits into
salimeid wants to merge 2 commits into
Conversation
salimeid
requested review from
MarcosDY,
amartinezfayo,
evan2645,
rturner3 and
sorindumitru
as code owners
There was a problem hiding this comment.
Pull request overview
This pull request makes SPIRE Agent’s gRPC timeout and federated bundle fetch concurrency configurable via experimental HCL settings, addressing bundle sync failures when many federations cause update cycles to exceed the fixed RPC timeout.
Changes:
- Exposes agent RPC timeout as an experimental
rpc_timeoutoption and applies it to agent client calls. - Exposes federated bundle fetch concurrency as an experimental
max_bundle_workersoption. - Adds CLI config parsing/validation and unit tests for the new experimental options.
Reviewed changes
Copilot reviewed 3 out of 3 changed files in this pull request and generated 4 comments.
| File | Description |
|---|---|
| pkg/agent/client/client.go | Introduces exported, configurable RPC timeout and bundle worker count; updates client call sites and worker spawning to use the configurable values. |
| cmd/spire-agent/cli/run/run.go | Adds experimental HCL fields, parses/validates them, and applies them to the agent client configuration with warnings. |
| cmd/spire-agent/cli/run/run_test.go | Adds test coverage for parsing/validation and warning logs for the new experimental settings. |
Comment on lines
+61
to
+63
| func SetRPCTimeout(d time.Duration) { | ||
| RPCTimeout = d | ||
| } |
Author
There was a problem hiding this comment.
Leaving this comment unresolved, reviewers can decide of which approach to take here
Both values were package-level constants with no way to tune them at runtime. Expose them as experimental HCL options following the same pattern as jwt_svid_cache_hit_timeout. Signed-off-by: Salim Eid <seid@genetec.com>
Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> Signed-off-by: Salim Eid <4256703+salimeid@users.noreply.github.com>
salimeid
force-pushed
the
user/se/agent-concurrency-config
branch
from
a7691da to
bd9a463
Compare
| const ( | ||
| rpcTimeout = 30 * time.Second | ||
|
|
||
| // maxBundleWorkers is the maximum number of worker goroutines to use when fetching bundles. |
Member
There was a problem hiding this comment.
We should keep this comment.
Comment on lines
+32
to
33
| rpcTimeout = 30 * time.Second | ||
| maxBundleWorkers = 10 |
Member
There was a problem hiding this comment.
Could you rename these to defaultX to differentiate them from the other ones
Comment on lines
+39
to
+40
| RPCTimeout = rpcTimeout | ||
| MaxBundleWorkers = maxBundleWorkers |
Member
There was a problem hiding this comment.
These do not need to be exported, maybe after renaming the consts, these can become rpcTimeout and maxBundleWorkers.
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
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.
Both values were package-level constants with no way to tune them at runtime. Expose them as experimental HCL options following the same pattern as jwt_svid_cache_hit_timeout.
Affected functionality
Fetching of federated trust bundles.
Description of change
Makes spire-agent gRPC Timeout and federated bundle fetch's concurrency configurable.
Which issue this PR fixes
Fixes: #6490