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

Perf optimization in adapter lookup table #568

Merged
merged 3 commits into from
Oct 11, 2024
Merged

Perf optimization in adapter lookup table #568

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8bd80b9
Perf optimization in adapter lookup table
anmenaga Oct 8, 2024
3b87bfd
Perf optimization in adapter lookup table 2
anmenaga Oct 8, 2024
4a6054f
Update dsc/tests/dsc_discovery.tests.ps1
anmenaga Oct 11, 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
19 changes: 17 additions & 2 deletions dsc/tests/dsc_discovery.tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,10 +144,25 @@ Describe 'tests for resource discovery' {
$TestClassResourcePath = Resolve-Path "$PSScriptRoot/../../powershell-adapter/Tests"
$env:DSC_RESOURCE_PATH = $null
$env:PSModulePath += [System.IO.Path]::PathSeparator + $TestClassResourcePath
dsc resource list -a Microsoft.DSC/PowerShell | Out-Null
"{'Name':'TestClassResource1'}" | dsc -l trace resource get -r 'TestClassResource/TestClassResource' 2> $TestDrive/tracing.txt

# remove adapter lookup table file
Remove-Item -Force -Path $script:lookupTableFilePath -ErrorAction Stop
Test-Path $script:lookupTableFilePath -PathType Leaf | Should -BeFalse

# initial invocation should populate and save adapter lookup table
dsc -l trace resource list -a Microsoft.DSC/PowerShell 2> $TestDrive/tracing.txt
"$TestDrive/tracing.txt" | Should -FileContentMatchExactly "Read 0 items into lookup table"
"$TestDrive/tracing.txt" | Should -FileContentMatchExactly "Saving lookup table"

# second invocation (without an update) should use but not save adapter lookup table
"{'Name':'TestClassResource1'}" | dsc -l trace resource get -r 'TestClassResource/TestClassResource' 2> $TestDrive/tracing.txt
"$TestDrive/tracing.txt" | Should -FileContentMatchExactly "Lookup table found resource 'testclassresource/testclassresource' in adapter 'Microsoft.DSC/PowerShell'"
"$TestDrive/tracing.txt" | Should -Not -FileContentMatchExactly "Saving lookup table"

# third invocation (with an update) should save updated adapter lookup table
dsc -l trace resource list -a Test/TestGroup 2> $TestDrive/tracing.txt
"$TestDrive/tracing.txt" | Should -FileContentMatchExactly "Saving lookup table"

$env:PSModulePath = $oldPSModulePath
}

Expand Down
11 changes: 9 additions & 2 deletions dsc_lib/src/discovery/command_discovery.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -536,15 +536,22 @@ fn add_resources_to_lookup_table(adapted_resources: &BTreeMap<String, Vec<DscRes
{
let mut lookup_table = load_adapted_resources_lookup_table();

let mut lookup_table_changed = false;
for (resource_name, res_vec) in adapted_resources {
if let Some(adapter_name) = &res_vec[0].require_adapter {
lookup_table.insert(resource_name.to_string().to_lowercase(), adapter_name.to_string());
let new_value = adapter_name.to_string();
let oldvalue = lookup_table.insert(resource_name.to_string().to_lowercase(), new_value.clone());
if !lookup_table_changed && (oldvalue.is_none() || oldvalue.is_some_and(|val| val != new_value)) {
lookup_table_changed = true;
};
} else {
info!("Resource '{resource_name}' in 'adapted_resources' is missing 'require_adapter' field.");
}
};

save_adapted_resources_lookup_table(&lookup_table);
if lookup_table_changed {
save_adapted_resources_lookup_table(&lookup_table);
}
}

fn save_adapted_resources_lookup_table(lookup_table: &HashMap<String, String>)
Expand Down
Loading