[code sync] Merge code from sonic-net/sonic-utilities:202205 to 202205 #24
Conversation
This file contains 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
Collaborator
mssonicbld
commented
Aug 24, 2023
mssonicbld
commented
…_config_db (#2946) #### What I did Fixes sonic-net/sonic-buildimage#16164 #### How I did it In the multi-asic devices for eg: supervisor card of a chassis, the asics are not of its own -- it is the asic present in the fabric cards in the chassis. On then -- all the fabric cards need not be present in the chassis everytime. In that case golden_config_db.json file generated by NDM ( based on the Subdevices in the minigraph ) will not have all ASICs -- it will be for the fabric cards present in the chassis With the current logic, if there is an asic namespace missing -- config load_minigraph will exit with error as in the Issue #sonic-net/sonic-buildimage#16164 and not restart dockers. Add logic to check and continue if the "asic" namespace is not present in the golden_config_db.json for multi-asic platforms. #### How to verify it Verified on a SUP ``` admin@str2-xxxx-sup-1:~$ sudo config load_minigraph -y --override_config Disabling container monitoring ... Stopping SONiC target ... Running command: /usr/local/bin/sonic-cfggen -H -m -j /etc/sonic/init_cfg.json --write-to-db Running command: /usr/local/bin/sonic-cfggen -H -m -j /etc/sonic/init_cfg.json -n asic0 --write-to-db Running command: /usr/local/bin/sonic-cfggen -H -m -j /etc/sonic/init_cfg.json -n asic1 --write-to-db Running command: /usr/local/bin/sonic-cfggen -H -m -j /etc/sonic/init_cfg.json -n asic2 --write-to-db Running command: /usr/local/bin/sonic-cfggen -H -m -j /etc/sonic/init_cfg.json -n asic3 --write-to-db Running command: /usr/local/bin/sonic-cfggen -H -m -j /etc/sonic/init_cfg.json -n asic4 --write-to-db Running command: /usr/local/bin/sonic-cfggen -H -m -j /etc/sonic/init_cfg.json -n asic5 --write-to-db Running command: /usr/local/bin/sonic-cfggen -H -m -j /etc/sonic/init_cfg.json -n asic6 --write-to-db Running command: /usr/local/bin/sonic-cfggen -H -m -j /etc/sonic/init_cfg.json -n asic7 --write-to-db Running command: /usr/local/bin/sonic-cfggen -H -m -j /etc/sonic/init_cfg.json -n asic8 --write-to-db Running command: /usr/local/bin/sonic-cfggen -H -m -j /etc/sonic/init_cfg.json -n asic9 --write-to-db Running command: /usr/local/bin/sonic-cfggen -H -m -j /etc/sonic/init_cfg.json -n asic10 --write-to-db Running command: /usr/local/bin/sonic-cfggen -H -m -j /etc/sonic/init_cfg.json -n asic11 --write-to-db Running command: /usr/local/bin/sonic-cfggen -H -m -j /etc/sonic/init_cfg.json -n asic12 --write-to-db Running command: /usr/local/bin/sonic-cfggen -H -m -j /etc/sonic/init_cfg.json -n asic13 --write-to-db Running command: /usr/local/bin/sonic-cfggen -H -m -j /etc/sonic/init_cfg.json -n asic14 --write-to-db Running command: /usr/local/bin/sonic-cfggen -H -m -j /etc/sonic/init_cfg.json -n asic15 --write-to-db Running command: /usr/local/bin/sonic-cfggen -d -y /etc/sonic/sonic_version.yml -t /usr/share/sonic/templates/sonic-environment.j2,/etc/sonic/sonic-environment Running command: config qos reload --no-dynamic-buffer --no-delay Buffer definition template not found at /usr/share/sonic/device/x86_64-nokia_ixrxxxxe_sup-r0/Nokia-IXRxxxxE-SUP-10/0/buffers.json.j2 Buffer definition template not found at /usr/share/sonic/device/x86_64-nokia_ixrxxxxe_sup-r0/Nokia-IXRxxxxE-SUP-10/1/buffers.json.j2 Buffer definition template not found at /usr/share/sonic/device/x86_64-nokia_ixrxxxxe_sup-r0/Nokia-IXRxxxxE-SUP-10/2/buffers.json.j2 Buffer definition template not found at /usr/share/sonic/device/x86_64-nokia_ixrxxxxe_sup-r0/Nokia-IXRxxxxE-SUP-10/3/buffers.json.j2 Buffer definition template not found at /usr/share/sonic/device/x86_64-nokia_ixrxxxxe_sup-r0/Nokia-IXRxxxxE-SUP-10/4/buffers.json.j2 Buffer definition template not found at /usr/share/sonic/device/x86_64-nokia_ixrxxxxe_sup-r0/Nokia-IXRxxxxE-SUP-10/5/buffers.json.j2 Buffer definition template not found at /usr/share/sonic/device/x86_64-nokia_ixrxxxxe_sup-r0/Nokia-IXRxxxxE-SUP-10/6/buffers.json.j2 Buffer definition template not found at /usr/share/sonic/device/x86_64-nokia_ixrxxxxe_sup-r0/Nokia-IXRxxxxE-SUP-10/7/buffers.json.j2 Buffer definition template not found at /usr/share/sonic/device/x86_64-nokia_ixrxxxxe_sup-r0/Nokia-IXRxxxxE-SUP-10/8/buffers.json.j2 Buffer definition template not found at /usr/share/sonic/device/x86_64-nokia_ixrxxxxe_sup-r0/Nokia-IXRxxxxE-SUP-10/9/buffers.json.j2 Buffer definition template not found at /usr/share/sonic/device/x86_64-nokia_ixrxxxxe_sup-r0/Nokia-IXRxxxxE-SUP-10/10/buffers.json.j2 Buffer definition template not found at /usr/share/sonic/device/x86_64-nokia_ixrxxxxe_sup-r0/Nokia-IXRxxxxE-SUP-10/11/buffers.json.j2 Buffer definition template not found at /usr/share/sonic/device/x86_64-nokia_ixrxxxxe_sup-r0/Nokia-IXRxxxxE-SUP-10/12/buffers.json.j2 Buffer definition template not found at /usr/share/sonic/device/x86_64-nokia_ixrxxxxe_sup-r0/Nokia-IXRxxxxE-SUP-10/13/buffers.json.j2 Buffer definition template not found at /usr/share/sonic/device/x86_64-nokia_ixrxxxxe_sup-r0/Nokia-IXRxxxxE-SUP-10/14/buffers.json.j2 Buffer definition template not found at /usr/share/sonic/device/x86_64-nokia_ixrxxxxe_sup-r0/Nokia-IXRxxxxE-SUP-10/15/buffers.json.j2 Running command: pfcwd start_default Running command: config override-config-table /etc/sonic/golden_config_db.json Removing configDB overriden table first ... Overriding input config to configDB ... Overriding completed. No service is restarted. Removing configDB overriden table first ... Overriding input config to configDB ... Overriding completed. No service is restarted. Override config not present for asic1 <<<<<<<<<<<<<<<<<<<<< Removing configDB overriden table first ... Overriding input config to configDB ... Overriding completed. No service is restarted. Removing configDB overriden table first ... Overriding input config to configDB ... Overriding completed. No service is restarted. Removing configDB overriden table first ... Overriding input config to configDB ... Overriding completed. No service is restarted. Removing configDB overriden table first ... Overriding input config to configDB ... Overriding completed. No service is restarted. Removing configDB overriden table first ... Overriding input config to configDB ... Overriding completed. No service is restarted. Removing configDB overriden table first ... Overriding input config to configDB ... Overriding completed. No service is restarted. Removing configDB overriden table first ... Overriding input config to configDB ... Overriding completed. No service is restarted. Removing configDB overriden table first ... Overriding input config to configDB ... Overriding completed. No service is restarted. Removing configDB overriden table first ... Overriding input config to configDB ... Overriding completed. No service is restarted. Removing configDB overriden table first ... Overriding input config to configDB ... Overriding completed. No service is restarted. Removing configDB overriden table first ... Overriding input config to configDB ... Overriding completed. No service is restarted. Removing configDB overriden table first ... Overriding input config to configDB ... Overriding completed. No service is restarted. Override config not present for asic14 <<<<<<<<<<<<<<<<<<<<< Override config not present for asic15 <<<<<<<<<<<<<<<<<<<<< Restarting SONiC target ... Enabling container monitoring ... Reloading Monit configuration ... Reinitializing monit daemon ```
…le (cherry-pick to 202205) (#2950) * Add transceiver status CLI to show output from TRANSCEIVER_STATUS table (#2772) * Correct Command-Reference.md * Use double quote
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.