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

[hostcfgd] [202012] Fixed the brief blackout in hostcfgd using SubscriberStateTable #9228

Merged
merged 11 commits into from
Nov 23, 2021

Conversation

vivekrnv
Copy link
Contributor

Why I did it

Backporting #8861 to 202012

How I did it

How to verify it

tests/determine-reboot-cause_test.py .........                                                                                                                       [ 34%]
tests/procdockerstatsd_test.py .                                                                                                                                     [ 38%]
tests/caclmgrd/caclmgrd_dhcp_test.py ......                                                                                                                          [ 61%]
tests/hostcfgd/hostcfgd_test.py ..........                                                                                                                           [100%]
Nov  5 19:37:26.999907 r-lionfish-16 INFO /hostcfgd: ConfigDB connect success
Nov  5 19:37:27.000092 r-lionfish-16 INFO /hostcfgd: KdumpCfg init...
Nov  5 19:37:27.026653 r-lionfish-16 INFO /hostcfgd: Waiting for systemctl to finish initialization
Nov  5 19:37:27.042503 r-lionfish-16 INFO /hostcfgd: systemctl has finished initialization -- proceeding ...
Nov  5 19:37:27.093703 r-lionfish-16 INFO /hostcfgd: Kdump handler...
Nov  5 19:37:27.093924 r-lionfish-16 INFO /hostcfgd: Kdump global configuration update
Nov  5 19:37:27.799234 r-lionfish-16 INFO hostcfgd[234919]: kdump is already disabled
Nov  5 19:37:27.799324 r-lionfish-16 INFO hostcfgd[234919]: Kdump is already disabled
Nov  5 19:37:28.212487 r-lionfish-16 INFO hostcfgd[234961]: Kdump configuration has been updated in the startup configuration
Nov  5 19:37:28.659445 r-lionfish-16 INFO hostcfgd[234976]: Kdump configuration has been updated in the startup configuration
Nov  5 19:37:28.691903 r-lionfish-16 INFO /hostcfgd: Feature swss is enabled and started
Nov  5 19:37:28.711435 r-lionfish-16 INFO /hostcfgd: Feature lldp is enabled and started
Nov  5 19:37:28.730893 r-lionfish-16 INFO /hostcfgd: Running cmd: 'sudo systemctl unmask sflow.service'
Nov  5 19:37:28.754107 r-lionfish-16 INFO hostcfgd[235002]: Removed /etc/systemd/system/sflow.service.
Nov  5 19:37:29.180023 r-lionfish-16 INFO /hostcfgd: Running cmd: 'sudo systemctl enable sflow.service'
Nov  5 19:37:29.193978 r-lionfish-16 INFO hostcfgd[235021]: Created symlink /etc/systemd/system/sonic.target.wants/sflow.service → /lib/systemd/system/sflow.service.
Nov  5 19:37:29.621868 r-lionfish-16 INFO /hostcfgd: Running cmd: 'sudo systemctl start sflow.service'
Nov  5 19:37:30.100161 r-lionfish-16 INFO /hostcfgd: Feature sflow is enabled and started
Nov  5 19:37:30.117581 r-lionfish-16 INFO /hostcfgd: Feature radv is enabled and started
Nov  5 19:37:30.135637 r-lionfish-16 INFO /hostcfgd: Feature teamd is enabled and started
Nov  5 19:37:30.152337 r-lionfish-16 INFO /hostcfgd: Feature what-just-happened is enabled and started
Nov  5 19:37:30.169778 r-lionfish-16 INFO /hostcfgd: Feature snmp is enabled and started
Nov  5 19:37:30.186031 r-lionfish-16 INFO /hostcfgd: Feature telemetry is enabled and started
Nov  5 19:37:30.203852 r-lionfish-16 INFO /hostcfgd: Feature pmon is enabled and started
Nov  5 19:37:30.221953 r-lionfish-16 INFO /hostcfgd: Feature dhcp_relay is enabled and started
Nov  5 19:37:30.239453 r-lionfish-16 INFO /hostcfgd: Feature bgp is enabled and started
Nov  5 19:37:30.256187 r-lionfish-16 INFO /hostcfgd: Feature mgmt-framework is enabled and started
Nov  5 19:37:30.273000 r-lionfish-16 INFO /hostcfgd: Feature database is enabled and started
Nov  5 19:37:30.290031 r-lionfish-16 INFO /hostcfgd: Feature syncd is enabled and started
Nov  5 19:37:30.306905 r-lionfish-16 INFO /hostcfgd: Feature nat is stopped and disabled

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

  • 201811
  • 201911
  • 202006
  • 202012
  • 202106

Description for the changelog

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

Signed-off-by: Vivek Reddy Karri <vkarri@nvidia.com>

d03ba4fa [202012] [portstat, intfstat] added rates and utilization  (sonic-net#1812)
499ad3f4 [config reload] Fix config reload failure due to sonic.target job cancellation (sonic-net#1814)
96d658c2 [202012][sonic installer] Add swap setup support (sonic-net#1815)
a9c69702 platform pre-check for reboot in 202012 branch (sonic-net#1788)
0e0478ba Unify the number format in the ourput of portstat and pfcstat in all cases (sonic-net#1795)
2d1e00ed [ecnconfig] Fix exception seen during display and add unit tests (sonic-net#1784) (sonic-net#1789)
Signed-off-by: Vivek Reddy Karri <vkarri@nvidia.com>
Signed-off-by: Vivek Reddy Karri <vkarri@nvidia.com>
Signed-off-by: Vivek Reddy Karri <vkarri@nvidia.com>
@vivekrnv
Copy link
Contributor Author

@qiluo-msft, Can you review this?

@@ -23,13 +23,14 @@
],
setup_requires = [
'pytest-runner',
'wheel'
'wheel',
Copy link
Collaborator

@qiluo-msft qiluo-msft Nov 11, 2021

Choose a reason for hiding this comment

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

,

This is not in old PR. I am always wondering how do you cherry-pick and resolve conflicts locally. #Closed

Copy link
Contributor Author

@vivekrnv vivekrnv Nov 11, 2021

Choose a reason for hiding this comment

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

I'm sorry. Removed this comma. Cherry pick in this case wasn't possible. As the code for Feature Handler has diverged a lot and the master version has changes related to auto_restart param, i had to rewrite instead

@@ -6,10 +6,13 @@ import ipaddress
import os
import subprocess
import syslog
import signal
import sys
Copy link
Collaborator

Choose a reason for hiding this comment

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

Seems like you change order during backport. It will make others backport difficult in general. Could you try minimize new changes during the backport?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Reordered imports and added safe_eval method

@vivekrnv
Copy link
Contributor Author

/azpw run

@mssonicbld
Copy link
Collaborator

/AzurePipelines run

@azure-pipelines
Copy link

You have several pipelines (over 10) configured to build pull requests in this repository. Specify which pipelines you would like to run by using /azp run [pipelines] command. You can specify multiple pipelines using a comma separated list.

@vivekrnv
Copy link
Contributor Author

/azpw run

@mssonicbld
Copy link
Collaborator

/AzurePipelines run

@azure-pipelines
Copy link

You have several pipelines (over 10) configured to build pull requests in this repository. Specify which pipelines you would like to run by using /azp run [pipelines] command. You can specify multiple pipelines using a comma separated list.

@vivekrnv
Copy link
Contributor Author

/azpw run

@mssonicbld
Copy link
Collaborator

/AzurePipelines run

@azure-pipelines
Copy link

You have several pipelines (over 10) configured to build pull requests in this repository. Specify which pipelines you would like to run by using /azp run [pipelines] command. You can specify multiple pipelines using a comma separated list.

@vivekrnv
Copy link
Contributor Author

/azpw run Azure.sonic-buildimage

@mssonicbld
Copy link
Collaborator

/AzurePipelines run Azure.sonic-buildimage

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@dgsudharsan
Copy link
Collaborator

@qiluo-msft The pipeline is passing now. Can you please help with the merge?


def aaa_handler(self, key, data):
def aaa_handler(self, key, op, data):
self.aaacfg.aaa_update(key, data)
Copy link
Collaborator

Choose a reason for hiding this comment

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

aaa_update

You missed a syslog statement, comparing with #8861

@vivekrnv
Copy link
Contributor Author

@qiluo-msft, CI checks are passing, can you help signoff?

@qiluo-msft qiluo-msft merged commit edd6b84 into sonic-net:202012 Nov 23, 2021
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.

4 participants