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.

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

auto cherry-pick 45 into 202111 #46

Merged
merged 1 commit into from
Jul 25, 2022

Conversation

mssonicbld
Copy link
Collaborator

No description provided.

@github-actions
Copy link

@liushilongbuaa liushilongbuaa merged this pull request into liushilongbuaa:202111 Jul 25, 2022
@mssonicbld mssonicbld deleted the 45-202111 branch October 28, 2022 06:16
liushilongbuaa pushed a commit that referenced this pull request Nov 11, 2022
…onic-net#10406)

#### Why I did it
To take the following into sonic-buildimage
36e1f61 API endpoints to ConfigDBConnector to support pre-loading data without blackout (sonic-net#587)

[sonic-swss-common](https://github.com/Azure/sonic-swss-common)
```
36e1f61 API endpoints to ConfigDBConnector to support pre-loading data without blackout (sonic-net#587)
556f4ad Add SAI copy action to ACL schema (sonic-net#591)
db18c3a Fix bitwidth of mac address in SAI ACL schema (sonic-net#590)
e9442bb [ConfigDBPipeConnector]: Added set_entry API (sonic-net#586)
6c007c0 Update README for gmock (sonic-net#562)
```

[sonic-linkmgrd](https://github.com/Azure/sonic-linkmgrd)
```
83dfc99 Enforce uniform file/class naming convention (#52)
83004bf Shutdown ICMP heartbeats when default route state is missing and ToR is in `auto` mode (#44)
b81ea31 Add `LinkProberStateMachineActiveActive`  (#47)
c43cf7a Decrease link probing interval after switchover to better determine the overhead of a toggle (#43)
2239fbe Enhance clang format (#46)
```
#### How I did it
* Advanced submodules pointers

#### How to verify it
1. make configure PLATFORM=mellanox
2. make target/sonic-mellanox.bin
liushilongbuaa pushed a commit that referenced this pull request Mar 16, 2023
…cause file removal issue (sonic-host-services #46) (sonic-net#14106)

Why I did it
Porting/cherry-pick PR sonic-net/sonic-host-services#46
"show reboot-cause history" shows empty history. When the previous-reboot-cause has a broken symlink, And rebooting the system will not be able to generate a new symlink of the new previous-reboot-cause.

admin@sonic:~$ show reboot-cause history 
Name    Cause    Time    User    Comment
------  -------  ------  ------  ---------
How I did it
Somehow, when the symlink file /host/reboot-cause/previous-reboot-cause is broken (which its destination files doesn't exist in this case), the current condition check "if os.path,exists(PREVIOUS_REBOOT_CAUSE_FILE)" will return False in determine-reboot-cause script. Hence, the current previous-reboot-cause is not been removed and the recreation of the new previous-reboot-cause failed. In case of previous-reboot-cause is a broken synlink file, add condition os.path.islink(PREVIOUS_REBOOT_CAUSE) to check and allow the remove operation happens.

How to verify it
Manually make the /host/reboot-cause/previous-reboot-cause to be a broken symlink file by removing its destination file
reboot the system. "show reboot-cause history" should show the correct info

Signed-off-by: mlok <marty.lok@nokia.com>
liushilongbuaa pushed a commit that referenced this pull request Feb 27, 2024
…ly (sonic-net#18046)

#### Why I did it
src/dhcprelay
```
* 363fa06 - (HEAD -> master, origin/master, origin/HEAD) Skip vlans with no dhcpv6 server configured (#46) (8 hours ago) [kellyyeh]
```
#### How I did it
#### How to verify it
#### Description for the changelog
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants