Skip to content

[aboot] add SWI_DEFAULT support in boot0#2056

Merged
lguohan merged 1 commit intosonic-net:masterfrom
Staphylo:boot-next-swi
Sep 20, 2018
Merged

[aboot] add SWI_DEFAULT support in boot0#2056
lguohan merged 1 commit intosonic-net:masterfrom
Staphylo:boot-next-swi

Conversation

@Staphylo
Copy link
Copy Markdown
Collaborator

- What I did

Currently setting the next boot image is the same as setting a default image.
With this change SWI_DEFAULT= will be considered the default image and SWI= the next image.
When executing the boot0 SWI= will be overriden by SWI_DEFAULT= if it
exists and create in with the value of SWI= otherwise.

- How to verify it

The code from sonic-net/sonic-utilities#323 is needed for CLI support.
However the boot-config file can still be crafted by manually setting SWI= and SWI_DEFAULT=

Currently setting the next boot image is the same as setting a default
image.
With this change SWI_DEFAULT= will be considered the default image and
SWI= the next image.
When executing the boot0 SWI= will be overriden by SWI_DEFAULT= if it
exists and create in with the value of SWI= otherwise.
@lguohan lguohan merged commit 7ece396 into sonic-net:master Sep 20, 2018
liat-grozovik pushed a commit that referenced this pull request Feb 1, 2022
53c630b [CoPP] Add always_enabled field to coppmgr logic ([minigraph]: Add PORTCHANNEL_MEMBER configurations #2034)
adcf69d [cbf] Fix cbf sync error ([aboot] add SWI_DEFAULT support in boot0 #2056)
69f9ee5 fix mclagsyncd out of order initialization ([submodules] update dbsyncd and snmpagent pointers for LLDP MIB support #2112)
Ndancejic pushed a commit to Ndancejic/sonic-buildimage that referenced this pull request May 3, 2022
What I did
Changed the CBF group members sync code to be non-assertive when one of its members is not yet synced.

Why I did it
There can be situations when the member of a CBF group is not yet synced by the time the CBF group is being synced. Some examples would be:

CBF group entry is created before its member in APPL_DB
Member sync is being blocked by something, like missing a neighbor/NH entry
In this scenarios, we should wait for the member to be synced instead of asserting as the member might become available shortly.

How I verified it
Added a new UT
@Staphylo Staphylo deleted the boot-next-swi branch December 6, 2022 14:59
byu343 pushed a commit to byu343/sonic-buildimage that referenced this pull request Apr 7, 2026
#### Why I did it

Backport public SONiC PR sonic-net#26147 to the
`202412` branch.

`swss:countersyncd` in orchagent is started through dependent-startup,
but the current supervisor stanza leaves it at `EXITED` after an
unexpected exit instead of recovering it.

##### Work item tracking
- Microsoft ADO **(number only)**: N/A

#### How I did it

- cherry-pick the original backport-safe changes from
sonic-net#26147
- change `countersyncd` supervisor policy from `autorestart=false` to
`autorestart=unexpected`
- set `startsecs=10`
- set `startretries=3`

#### How to verify it

Validated on 202412 DUT image `20241212.54`.

Equivalent live-patched supervisor settings were applied on DUT
`str4-sn5640-2`, then HFT telemetry validation was rerun successfully.

Relevant result:
-
`high_frequency_telemetry/test_high_frequency_telemetry.py::test_hft_port_counters`
- result: `1 passed`
- `swss:countersyncd` remained `RUNNING` after telemetry capture

#### Which release branch to backport (provide reason below if selected)

- [ ] 201811
- [ ] 201911
- [ ] 202006
- [ ] 202012
- [ ] 202106
- [ ] 202111
- [ ] 202205
- [ ] 202211
- [ ] 202305

Base branch of this PR is already `202412`.

#### Tested branch (Please provide the tested image version)

- [x] 20241212.54

#### Description for the changelog
Restart `swss:countersyncd` automatically after unexpected exits.

#### Link to config_db schema for YANG module changes
N/A

#### A picture of a cute animal (not mandatory but encouraged)
🦦

---------

Signed-off-by: Ze Gan <ganze718@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants