Skip to content

fix: GetLocalGroups RPC response time too variant for adaptive timeouts #277

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

Open
definitelynotagoblin wants to merge 2 commits into
base: v4
Choose a base branch
from
Open

fix: GetLocalGroups RPC response time too variant for adaptive timeouts #277

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6e16de7
fix: GetLocalGroups for RPC is too inconsistent in payload and respon…
definitelynotagoblin Mar 4, 2026
61c6d8a
Merge branch 'v4' into anemeth/rpc-get-group-members-timeout-fix
definitelynotagoblin Mar 4, 2026
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
4 changes: 1 addition & 3 deletions src/CommonLib/Processors/LocalGroupProcessor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ public class LocalGroupProcessor
private readonly AdaptiveTimeout _openDomainAdaptiveTimeout;
private readonly AdaptiveTimeout _getAliasesAdaptiveTimeout;
private readonly AdaptiveTimeout _openAliasAdaptiveTimeout;
private readonly AdaptiveTimeout _getMembersAdaptiveTimeout;
private readonly AdaptiveTimeout _lookupPrincipalBySidAdaptiveTimeout;

public LocalGroupProcessor(ILdapUtils utils, ILogger log = null) {
Expand All @@ -36,7 +35,6 @@ public LocalGroupProcessor(ILdapUtils utils, ILogger log = null) {
_openDomainAdaptiveTimeout = new AdaptiveTimeout(maxTimeout: TimeSpan.FromMinutes(2), Logging.LogProvider.CreateLogger(nameof(ISAMServer.OpenDomain)));
_getAliasesAdaptiveTimeout = new AdaptiveTimeout(maxTimeout: TimeSpan.FromMinutes(2), Logging.LogProvider.CreateLogger(nameof(ISAMDomain.GetAliases)));
_openAliasAdaptiveTimeout = new AdaptiveTimeout(maxTimeout: TimeSpan.FromMinutes(2), Logging.LogProvider.CreateLogger(nameof(ISAMDomain.OpenAlias)));
_getMembersAdaptiveTimeout = new AdaptiveTimeout(maxTimeout: TimeSpan.FromMinutes(2), Logging.LogProvider.CreateLogger(nameof(ISAMAlias.GetMembers)));
_lookupPrincipalBySidAdaptiveTimeout = new AdaptiveTimeout(maxTimeout: TimeSpan.FromMinutes(2), Logging.LogProvider.CreateLogger(nameof(ISAMServer.LookupPrincipalBySid)));
}

Expand Down Expand Up @@ -214,7 +212,7 @@ await SendComputerStatus(new CSVComputerStatus

var localGroup = openAliasResult.Value;
//Call GetMembersInAlias to get raw group members
var getMembersResult = await _getMembersAdaptiveTimeout.ExecuteRPCWithTimeout((_) => localGroup.GetMembers());
var getMembersResult = await Timeout.ExecuteRPCWithTimeout(TimeSpan.FromMinutes(2), (_) => localGroup.GetMembers());
if (getMembersResult.IsFailed)
{
_log.LogTrace("Failed to get members in alias {Alias} with RID {Rid} in domain {Domain} on computer {ComputerName}: {Error}", alias.Name, alias.Rid, domainResult.Name, computerName, openAliasResult.Error);
Expand Down
Loading