Skip to content

hardware: Fix bugs in max threads calculation and validate schema property #225

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

Merged
merged 2 commits into from
Sep 16, 2024
Merged

hardware: Fix bugs in max threads calculation and validate schema property #225

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9583275
quattor/types/hardware: Ensure max_threads is not less than number of…
jrha Sep 11, 2024
b682732
quattor/functions/hardware: Fix thread calculation
jrha Sep 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
8 changes: 2 additions & 6 deletions quattor/functions/hardware.pan
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,15 +41,11 @@ function get_num_of_cores_max_threads = {
'threads', 0,
);
foreach (i; cpu; hw_config['cpu']) {
result['cores'] = result['cores'] + cpu['cores'];
if (is_defined(cpu['max_threads'])) {
result['threads'] = result['threads'] + cpu['max_threads'];
} else {
result['threads'] = result['threads'] + 1;
};
if (is_defined(cpu['cores'])) {
result['cores'] = result['cores'] + cpu['cores'];
} else {
result['cores'] = result['cores'] + 1;
result['threads'] = result['threads'] + cpu['cores'];
};
};
debug('%s: num of CPUs=%d, num of cores=%d', OBJECT, length(hw_config['cpu']), cores);
Expand Down
6 changes: 6 additions & 0 deletions quattor/types/hardware.pan
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,12 @@ type structure_cpu = {
deprecated(0, 'The hyperthreading cpu property has been deprecated, please migrate to max_threads');
true;
}
} with {
if (exists(SELF['max_threads']) && SELF['max_threads'] < SELF['cores']) {
error("Number of execution threads (max_threads) cannot be less than number of CPU cores (cores)");
} else {
true;
};
};


Expand Down