[DELLEMC][S6000] Platform 2.0 Reboot Reason and fixed issue in process-reboot-cause #3156

sridhar-ravindran · 2019-07-15T05:48:13Z

- What I did

Added Reboot Reason for S6000 in platform 2.0
Fixed issue in process-reboot-cause
Added package uninstall code in platform de-init code for z9100, s6100
- How I did it
-> Added support for S6000 Reboot Reason
-> Added platform.py for all platforms
-> Verified show reboot-cause command with the code changes. Added UT logs with show reboot-cause
-> Modified process-reboot-cause service to start after pmon.service. In S6000, we have to wait for nvram to be loaded.
-> If reboot-cause service starts before pmon.service, show reboot-cause is showing incorrect reason.
-> Bug fix in process-reboot-cause file
- import sonic_platform
+ import sonic_platform.platform

Changes to be committed:
(use "git reset HEAD ..." to unstage)

    modified:   files/image_config/process-reboot-cause/process-reboot-cause
    modified:   files/image_config/process-reboot-cause/process-reboot-cause.service
    modified:   platform/broadcom/sonic-platform-modules-dell/debian/platform-modules-s6000.init
    modified:   platform/broadcom/sonic-platform-modules-dell/debian/platform-modules-s6000.install
    modified:   platform/broadcom/sonic-platform-modules-dell/debian/rules
    modified:   platform/broadcom/sonic-platform-modules-dell/s6000/modules/dell_s6000_platform.c
    copied:     platform/broadcom/sonic-platform-modules-dell/debian/platform-modules-s6000.init -> platform/broadcom/sonic-platform-modules-dell/s6000/scripts/s6000_platform.sh
    new file:   platform/broadcom/sonic-platform-modules-dell/s6000/setup.py
    new file:   platform/broadcom/sonic-platform-modules-dell/s6000/sonic_platform/__init__.py
    new file:   platform/broadcom/sonic-platform-modules-dell/s6000/sonic_platform/chassis.py
    new file:   platform/broadcom/sonic-platform-modules-dell/s6000/sonic_platform/platform.py
    modified:   platform/broadcom/sonic-platform-modules-dell/s6000/systemd/platform-modules-s6000.service
    modified:   platform/broadcom/sonic-platform-modules-dell/s6100/scripts/s6100_platform.sh
    new file:   platform/broadcom/sonic-platform-modules-dell/s6100/sonic_platform/platform.py
    modified:   platform/broadcom/sonic-platform-modules-dell/z9100/scripts/z9100_platform.sh
    new file:   platform/broadcom/sonic-platform-modules-dell/z9100/sonic_platform/platform.py

- How to verify it
Verified show reboot-cause command with the code changes. Added UT logs with show reboot-cause

- Description for the changelog

Added Reboot reason for S6000 and fix issue in process-reboot-cause

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

…s-reboot-cause

sridhar-ravindran · 2019-07-15T05:55:29Z

Show_Reboot_Reason_UT_logs.txt

jleveque · 2019-07-15T19:32:03Z

files/image_config/process-reboot-cause/process-reboot-cause

@@ -70,7 +70,7 @@ def main():
    # if there is no sonic_platform package installed, we only provide
    # software-related reboot causes.
    try:
-        import sonic_platform
+        import sonic_platform.platform


Why is this necessary?

Hi Joe,

sonic_platform is directory. platform is the file.

When we import directory alone We get the following error.
From File :- /usr/bin/process-reboot-cause
import sonic_platform
# Check if the previous reboot was caused by hardware
platform = sonic_platform.platform.Platform()
chassis = platform.get_chassis()
hardware_reboot_cause, optional_details = chassis.get_reboot_cause()

root@sonic:/home/admin# /usr/bin/process-reboot-cause
Traceback (most recent call last):
File "/usr/bin/process-reboot-cause", line 121, in
main()
File "/usr/bin/process-reboot-cause", line 76, in main
platform = sonic_platform.platform.Platform()
AttributeError: 'module' object has no attribute 'platform'

When we import the file "platform" the script is working
import sonic_platform.platform
# Check if the previous reboot was caused by hardware
platform = sonic_platform.platform.Platform()
chassis = platform.get_chassis()
hardware_reboot_cause, optional_details = chassis.get_reboot_cause()

root@sonic:/home/admin# /usr/bin/process-reboot-cause
root@sonic:/home/admin# <<<<<<<<<<<<< No Error

Please let me know if my understanding is fine.

Thanks
Sridhar.R

Hmmm. I don't believe this should be necessary. You should be able to import the entire package by specifying the package (directory) name. Let me look into this further.

It appears for this to work, you need to modify the init.py file of your sonic_platform package to either import the files and/or list the module names in __all__. See: https://docs.python.org/3/tutorial/modules.html#importing-from-a-package

I should probably also do this for sonic_platform_base, as well.

Hi Joe,
After some literature study, i was able to successfully make it work. Updated init.py with
all = ["platform", "chassis"]
from sonic_platform import *

On adding these 2 lines, "import sonic_platform" works fine.

On adding new files like sfp.py , psu.py, device,py, we have to update the init.py file as well.

Thanks for your help and support Joe.

Thanks
Sridhar.R

jleveque · 2019-07-15T19:32:08Z

files/image_config/process-reboot-cause/process-reboot-cause.service

@@ -1,6 +1,6 @@
 [Unit]
 Description=Reboot cause determination service
-After=rc-local.service
+After=pmon.service


Why change this?

Hi Joe,
The hardware drivers required to provide reboot reason are installed only inside platform-modules-XXXX service.

When process-reboot-cause service starts before the pmon service, loading of drivers are not complete and it leads to race condition where the show reboot-cause CLI return incorrect answers.

If process-reboot-cause loads after pmon.service, the platform drivers would have successfully loaded by then and show reboot-cause cli will return correct value

Thanks
Sridhar.R

Hi Sridhar,

SONiC requires that hardware reboot reason and watchdog functionality need to be available in the host OS. The sonic_platform package should be installed in both the host OS and PMon container. Host OS services should not have any dependencies on the containers. We want reboot cause and watchdog to be as reliable as possible. Thanks.

Hi Joe,
Thanks for the input. I have removed the pmon dependency from process-restart-cause service.
Thanks
Sridhar.R

…module

jleveque · 2019-07-23T22:42:21Z

Retest vs please

sridhar-ravindran · 2019-07-29T15:55:02Z

Hi,

Could you please port this changes to november branch and 201904 branch

jleveque · 2019-07-29T17:54:26Z

@sridhar-ravindran: will this PR cherry-pick cleanly into those branches?

sridhar-ravindran · 2019-07-29T18:12:48Z

@sridhar-ravindran: will this PR cherry-pick cleanly into those branches?

Hi @jleveque
I will check and get back on this
Thanks
Sridhar.R

yxieca · 2019-07-30T19:15:02Z

This PR cannot be cherry-picked into 201811 branch directly. Can you make an PR 201811?

…net#3156) Added Reboot Reason for S6000 in platform 2.0 Fixed issue in process-reboot-cause Added package uninstall code in platform de-init code for z9100, s6100 - How I did it -> Added support for S6000 Reboot Reason -> Added platform.py for all platforms -> Verified show reboot-cause command with the code changes. Added UT logs with show reboot-cause -> Modified process-reboot-cause service to start after pmon.service. In S6000, we have to wait for nvram to be loaded. -> If reboot-cause service starts before pmon.service, show reboot-cause is showing incorrect reason. -> Bug fix in process-reboot-cause file - import sonic_platform + import sonic_platform.platform

…#3286)

[DELLEMC][S6000] Platform 2.0 Reboot Reason and fixed issue in proces…

5ebebd6

…s-reboot-cause

jleveque reviewed Jul 15, 2019

View reviewed changes

jleveque added Enhancement ➕ Platform: DellEMC labels Jul 15, 2019

sridhar-ravindran added 2 commits July 16, 2019 14:12

Address Review comments, remove reboot-cause dependency on pmon.service

db2a94a

Updated __init__.py so that we can import package instead of package.…

20681bb

…module

sridhar-ravindran mentioned this pull request Jul 17, 2019

DELL Platform 2.0 API Infra and Reboot Reason support in Z9100 & S6100 #3147

Merged

Added files in __init__.py

d69af6d

jleveque approved these changes Jul 23, 2019

View reviewed changes

lguohan merged commit 95558ad into sonic-net:master Jul 24, 2019

sridhar-ravindran deleted the s6000_reboot_reason branch July 25, 2019 02:49

jleveque added the Request for 201904 Branch 🏂 label Jul 30, 2019

stephenxs mentioned this pull request Jul 31, 2019

[Mellanox] Backporting reboot cause to 201811 #3198

Merged

sridhar-ravindran mentioned this pull request Aug 5, 2019

[DELLEMC][S6000] 201811 Porting of Platform 2.0 Reboot Reason (#3156) #3286

Merged

jleveque pushed a commit that referenced this pull request Aug 7, 2019

[DELLEMC][S6000] 201811 Porting of Platform 2.0 Reboot Reason (#3156) (…

ba3d85e

…#3286)

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[DELLEMC][S6000] Platform 2.0 Reboot Reason and fixed issue in process-reboot-cause #3156

[DELLEMC][S6000] Platform 2.0 Reboot Reason and fixed issue in process-reboot-cause #3156

sridhar-ravindran commented Jul 15, 2019

sridhar-ravindran commented Jul 15, 2019

jleveque Jul 15, 2019

sridhar-ravindran Jul 16, 2019 •

edited

Loading

jleveque Jul 16, 2019

jleveque Jul 16, 2019 •

edited

Loading

sridhar-ravindran Jul 17, 2019

jleveque Jul 15, 2019

sridhar-ravindran Jul 16, 2019 •

edited

Loading

jleveque Jul 16, 2019 •

edited

Loading

sridhar-ravindran Jul 16, 2019

jleveque commented Jul 23, 2019

sridhar-ravindran commented Jul 29, 2019

jleveque commented Jul 29, 2019

sridhar-ravindran commented Jul 29, 2019

yxieca commented Jul 30, 2019

[DELLEMC][S6000] Platform 2.0 Reboot Reason and fixed issue in process-reboot-cause #3156

[DELLEMC][S6000] Platform 2.0 Reboot Reason and fixed issue in process-reboot-cause #3156

Conversation

sridhar-ravindran commented Jul 15, 2019

sridhar-ravindran commented Jul 15, 2019

jleveque Jul 15, 2019

Choose a reason for hiding this comment

sridhar-ravindran Jul 16, 2019 • edited Loading

Choose a reason for hiding this comment

jleveque Jul 16, 2019

Choose a reason for hiding this comment

jleveque Jul 16, 2019 • edited Loading

Choose a reason for hiding this comment

sridhar-ravindran Jul 17, 2019

Choose a reason for hiding this comment

jleveque Jul 15, 2019

Choose a reason for hiding this comment

sridhar-ravindran Jul 16, 2019 • edited Loading

Choose a reason for hiding this comment

jleveque Jul 16, 2019 • edited Loading

Choose a reason for hiding this comment

sridhar-ravindran Jul 16, 2019

Choose a reason for hiding this comment

jleveque commented Jul 23, 2019

sridhar-ravindran commented Jul 29, 2019

jleveque commented Jul 29, 2019

sridhar-ravindran commented Jul 29, 2019

yxieca commented Jul 30, 2019

sridhar-ravindran Jul 16, 2019 •

edited

Loading

jleveque Jul 16, 2019 •

edited

Loading

sridhar-ravindran Jul 16, 2019 •

edited

Loading

jleveque Jul 16, 2019 •

edited

Loading