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

Adapt to the new WARM_RESTART_TABLE table schema: change from restart… #2083

Merged
merged 3 commits into from
Oct 2, 2018

Conversation

jipanyang
Copy link
Collaborator

…_count to restore_count

Signed-off-by: Jipan Yang jipan.yang@alibaba-inc.com

- What I did
With changes introduced in sonic-net/sonic-swss#600
WARM_RESTART_TABLE:restart_count got changed to WARM_RESTART_TABLE:restore_count

The swss related check for WARM_RESTART_TABLE:restart_count should be updated.

- How I did it

- How to verify it

docker upgrade and systemctl restart.

Don't merge the change until swss submodule updated

@@ -47,7 +47,7 @@ SYSTEM_WARM_START=`redis-cli -n 4 hget "WARM_RESTART|system" enable`
SWSS_WARM_START=`redis-cli -n 4 hget "WARM_RESTART|swss" enable`
if [[ "$SYSTEM_WARM_START" == "true" ]] || [[ "$SWSS_WARM_START" == "true" ]]; then
# We have to make sure db data has not been flushed.
RESTART_COUNT=`redis-cli -n 6 hget "WARM_RESTART_TABLE|orchagent" restart_count`
RESTART_COUNT=`redis-cli -n 6 hget "WARM_RESTART_TABLE|orchagent" restore_count`
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

do you also need to change the variable name here?

@lguohan
Copy link
Collaborator

lguohan commented Sep 26, 2018

also can you update the sonic-swss repo.

…_count to restore_count

Signed-off-by: Jipan Yang <jipan.yang@alibaba-inc.com>
Signed-off-by: Jipan Yang <jipan.yang@alibaba-inc.com>
Signed-off-by: Jipan Yang <jipan.yang@alibaba-inc.com>
@lguohan lguohan merged commit dedd562 into sonic-net:master Oct 2, 2018
abdosi pushed a commit that referenced this pull request Jan 21, 2022
Update the sonic-swss submodule. The following are new commits in the submodule:

6cb43ee [p4orch] Fix handlePortStatusChangeNotification status deserialize (#2111)
863f0f1 [azp]: Enable PR diff coverage (#2083)
bf4cd4a Fix the unsafe usage of strncpy in portsorch.cpp (#2110)
c1b4b40 support port isolation group in BFN platform (#1940)


Signed-off-by: Andriy Kokhan <andriyx.kokhan@intel.com>
theasianpianist added a commit to theasianpianist/sonic-buildimage that referenced this pull request Feb 5, 2022
- Setup AZP builds to enforce PR code diff coverage limits
- Current limit is at 0%, to be adjusted to actual value in a future PR

Signed-off-by: Lawrence Lee <lawlee@microsoft.com>
@wen587 wen587 mentioned this pull request Mar 7, 2022
6 tasks
wen587 added a commit that referenced this pull request Mar 8, 2022
47c243e [show][muxcable] fix the sudo access error for show muxcable metrics (#2083)
f872516 [muxcable][show] enhance show mux status to show last switchover time (#2067)
d440df7 [warmboot] Migrate 10G ports during warm-reboot on s6100 (#2064)
494c6d7 [counterpoll] Display the correct default poll interval for watermark counters (#2082)
499988e [show][config] add muxcable command line support for retrieve / reset ICMP packet loss data (#2046)
8b01d3e Remove the warning message appear when there are no ports on CONFIG DB (#2050)
ed6e66e [GCU] Supporting Groupings during path-xpath translation (#2044)
25b3455 [ci] Use official build debian pkg instead and parameterize source branch (#2079)
taras-keryk pushed a commit to taras-keryk/sonic-buildimage that referenced this pull request Apr 28, 2022
…onic-net#2083)

This change is required for such behavior with the command below, which works okay if you try with sudo

How to verify it
with the change, no need for sudo, tested on an arista 7050cx3 lab device

vdahiya@sonic:~$ show mux metrics Ethernet0
PORT       EVENT                         TIME
---------  ----------------------------  ---------------------------
Ethernet0  linkmgrd_switch_active_start  2022-Feb-28 18:49:59.350302
Ethernet0  xcvrd_switch_active_start     2022-Feb-28 18:49:59.354076
Ethernet0  xcvrd_switch_active_end       2022-Feb-28 18:49:59.357925
Ethernet0  linkmgrd_switch_active_end    2022-Feb-28 18:49:59.35919

Signed-off-by: vaibhav-dahiya <vdahiya@microsoft.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