[multi-asic] Fixed systemd-sonic-generator for multi-asic#7954
Merged
judyjoseph merged 1 commit intosonic-net:masterfrom Jul 8, 2021
anamehra:anamehra/master/ssg
Merged
[multi-asic] Fixed systemd-sonic-generator for multi-asic#7954judyjoseph merged 1 commit intosonic-net:masterfrom anamehra:anamehra/master/ssg
judyjoseph merged 1 commit intosonic-net:masterfrom
anamehra:anamehra/master/ssg
Conversation
1. In function insert_instance_number instance_string was malloced for 2 char
size which was limiting the instance number value in instance_name to 1 digit.
Fixed insert_instance_number to use asprintf to generate instancd_name for
any number of instances. Added _GNU_SOURCE to CFLAGS for asprintf.
2. Fixed get_unit_files() to use calloc instead of malloc. Uninitialized memory
was causing incorrect string mismatch error while comparing unit file name
string.
3. Increased MAX_NUM_TARGETS and MAX_NUM_INSTALL_LINES values to 48 to handle more
asic instances.
4. Added build UT support for systemd-sonic-generator:
a. Refactor systemd-sonic-generator.c to be used with UT infra.
b. Added UT infra to run build UT for systemd-sonic-generator
c. Added functional level and program level UT class and test cases.
Signed-off-by: Anand Mehra <[email protected]>
4 tasks
Contributor
Author
|
@anshuv-mfst Is it possible to trigger an armhf build as well for this PR? |
judyjoseph
approved these changes
Jun 29, 2021
Contributor
|
@lguohan - if I can go ahead and merge this PR, the local compilation for both armhf/arm64 arch is ok with the latest patch. |
lguohan
approved these changes
Jul 7, 2021
|
@judyjoseph - could you please help with merge, thanks |
judyjoseph
pushed a commit
that referenced
this pull request
Jul 13, 2021
Why I did it systemd-sonic-generator limits multi-asic unit file instances to 10 (single digit instance number 0 - 10). This limitation needs to be removed to handle more than 10 asics. MAX_NUM_TARGETS and MAX_NUM_INSTALL_LINES limits to 15 which is not sufficient for systems with more than 15 asics. Inside get_unit_files(), strcmp produce incorrect results due to non null terminated string being compared. Added build UT support for systemd-sonic-generator
carl-nokia
pushed a commit
to carl-nokia/sonic-buildimage
that referenced
this pull request
Aug 7, 2021
…7954) Why I did it systemd-sonic-generator limits multi-asic unit file instances to 10 (single digit instance number 0 - 10). This limitation needs to be removed to handle more than 10 asics. MAX_NUM_TARGETS and MAX_NUM_INSTALL_LINES limits to 15 which is not sufficient for systems with more than 15 asics. Inside get_unit_files(), strcmp produce incorrect results due to non null terminated string being compared. Added build UT support for systemd-sonic-generator
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
4 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.
Signed-off-by: Anand Mehra [email protected]
Why I did it
How I did it
In function insert_instance_number instance_string was malloced for 2 char
size which was limiting the instance number value in instance_name to 1 digit.
Fixed insert_instance_number to use asprintf to generate instancd_name for
any number of instances. Added _GNU_SOURCE to CFLAGS for asprintf.
Fixed get_unit_files() to use calloc instead of malloc. Uninitialized memory
was causing incorrect string mismatch error while comparing unit file name
string.
Increased MAX_NUM_TARGETS and MAX_NUM_INSTALL_LINES values to 48 to handle more
asic instances.
Added build UT support for systemd-sonic-generator:
a. Refactor systemd-sonic-generator.c to be used with UT infra.
b. Added UT infra to run build UT for systemd-sonic-generator
c. Added functional level and program level UT class and test cases.
How to verify it
On a single asic system:
Verify Unit file symlinks at following path for single instance system:
/run/systemd/generator/multi-user.target.wants/
/run/systemd/generator/sonic.target.wants/
/run/systemd/generator/swss.service.wants/
On a multi asic system:
Verify Unit file symlinks at following path for multi instance system:
/run/systemd/generator/multi-user.target.wants/
/run/systemd/generator/sonic.target.wants/
/run/systemd/generator/[email protected]/ where n is instance num 0 - (num_asic-1)
systemd-sonic-generator_1.0.0_armhf.deb.log
systemd-sonic-generator_1.0.0_amd64.deb.log
Which release branch to backport (provide reason below if selected)
Description for the changelog
A picture of a cute animal (not mandatory but encouraged)