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.

Sign up for GitHub

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

[device]: Fix a bug that psuutil cannot access gpio sysfs to get PSU status #1789

Merged

jleveque merged 8 commits into sonic-net:master from unknown repository

Jun 21, 2018

Contributor

mudsut4ke commented Jun 13, 2018

- What I did
Fix bug that found on #1781

- How I did it
Update code to support dynamic sysfs gpio base.

- How to verify it
In SONiC run psuutil cli to test the following case:
PSU1: Absence
PSU1: Presence, no-power
PSU2: Absence
PSU1: Presence, no-power

pphuchar and others added 4 commits

June 9, 2018 16:50


Add Celestica seastone dx010 psuutil.py plugins


Fix psuutil to use dynamic sysfs gpio base.

000a63a


add exeption handler for psuutil

f393c4c


Merge branch 'master' into Add-psuutil-seastone2-dx010

a0db28d

lguohan reviewed

View reviewed changes

device/celestica/x86_64-cel_seastone-r0/plugins/psuutil.py Outdated

  try:
  with open(export_file, 'w') as fd:
  fd.write(str(gpio_base+pinnum))
  except Exception as error:
- logging.error("Unable to export gpio ", pinnum)
+ logging.error("Unable to export gpio ", str(gpio_base+pinnum))
+ sys.exit(0)

Collaborator

lguohan Jun 13, 2018

why exit 0 here? the plugin should not do exit

Contributor Author

mudsut4ke Jun 13, 2018

@lguohan OK I'll remove it

lguohan reviewed

View reviewed changes

device/celestica/x86_64-cel_seastone-r0/plugins/psuutil.py Outdated

@@ @@ -54,6 +67,7 @@ def read_psu_statuses(self, pinnum): @@
  retval = fd.read()
  except Exception as error:
  logging.error("Unable to open ", gpio_file, "file !")
+ sys.exit(0)

Collaborator

lguohan Jun 13, 2018

the plugin should not do exit.

Contributor Author

mudsut4ke Jun 13, 2018

@lguohan OK I'll remove it


remove sys.exit from psuutil

jleveque suggested changes

View reviewed changes

device/celestica/x86_64-cel_seastone-r0/plugins/psuutil.py Outdated

  try:
  with open(export_file, 'w') as fd:
  fd.write(str(gpio_base+pinnum))
  except Exception as error:
- logging.error("Unable to export gpio ", pinnum)
+ logging.error("Unable to export gpio ", str(gpio_base+pinnum))

Contributor

jleveque Jun 13, 2018 •

edited

Loading

This is invalid syntax. Please change to

logging.error("Unable to export gpio " + str(gpio_base+pinnum))

Contributor Author

mudsut4ke Jun 15, 2018

OK, I will change it.


Change logging format for psuutil

a5c64bf

jleveque approved these changes

View reviewed changes

lguohan reviewed

View reviewed changes

device/celestica/x86_64-cel_seastone-r0/plugins/psuutil.py Outdated

+ except Exception as error:
+ logging.error("Unable to get gpio base")
  def init_psu_gpio(self, pinnum):

Collaborator

lguohan Jun 16, 2018

this init_psu_gpio should move to your driver, we should not do init psu gpio on-the-fly.

Contributor Author

mudsut4ke Jun 18, 2018

@jleveque, We will update init_psu_gpio after we updated our driver

Contributor Author

mudsut4ke Jun 18, 2018

@pphuchar Please add this to our platform driver

lguohan reviewed

View reviewed changes

device/celestica/x86_64-cel_seastone-r0/plugins/psuutil.py Outdated

@@ -53,7 +63,7 @@ def read_psu_statuses(self, pinnum):

 with open(gpio_file, 'r') as fd:

 retval = fd.read()

 except Exception as error:

 logging.error("Unable to open ", gpio_file, "file !")

 logging.error("Unable to open " + gpio_file + "file !")

Collaborator

lguohan Jun 16, 2018

we should further raise in the plugin, retval = 'ERR' is not the convention to convene error to the caller.

Contributor Author

mudsut4ke Jun 18, 2018

OK , I will add raise statement to report the error

lguohan reviewed

View reviewed changes

device/celestica/x86_64-cel_seastone-r0/plugins/psuutil.py Outdated

@@ @@ -53,7 +63,7 @@ def read_psu_statuses(self, pinnum): @@
  with open(gpio_file, 'r') as fd:
  retval = fd.read()
  except Exception as error:

Collaborator

lguohan Jun 16, 2018

we should not catch general exception here, we should only catch exception we can handle in this case the io or file exception.

Contributor Author

mudsut4ke Jun 18, 2018

OK, I will change it

jleveque suggested changes

View reviewed changes

Contributor

jleveque left a comment

As per Guohan's comments above.

stcheng added the Bug 🐛 label

wirut added 2 commits

June 19, 2018 16:44


Update exception handler

1c991b5


Remove init psu gpio method

bcc3484

lguohan approved these changes

View reviewed changes

jleveque approved these changes

View reviewed changes

jleveque merged commit aaac497 into sonic-net:master

mudsut4ke deleted the Add-psuutil-seastone2-dx010 branch

June 22, 2018 03:06

pphuchar mentioned this pull request

[Platform] Celestica: Add dx010 platform gpio init #1807

Merged

lguohan pushed a commit that referenced this pull request


[device]: Fix a bug that psuutil cannot access gpio sysfs to get PSU …

310c3f9

…status (#1789)

tiantianlv pushed a commit to tiantianlv/sonic-buildimage that referenced this pull request


Revert "[device]: Fix a bug that psuutil cannot access gpio sysfs to …

bbe1580

…get PSU status (sonic-net#1789)"

This reverts commit 310c3f9.

stcheng added the Platform: Celestica label

stephenxs added a commit to stephenxs/sonic-buildimage that referenced this pull request


[sonic-swss][202012] Update submodule

43e057d

f54b7d0b [Dynamic Buffer Calc][202012]Bug fix: Don't create lossless buffer profile for active ports without speed configured (sonic-net#1820)
ac7f5cff Td2: Reclaim buffer from unused ports (sonic-net#1830)
04105a4b [debugcounterorch] check if counter type is supported before querying (sonic-net#1789)
a67d8af6 [202012][portsorch] fix errors when moving port from one lag to another. (sonic-net#1819)

Signed-off-by: Stephen Sun <stephens@nvidia.com>

prsunny mentioned this pull request

[202012] [Submodule] Update sonic-swss #8644

Closed

5 tasks

volodymyrsamotiy added a commit to volodymyrsamotiy/sonic-buildimage that referenced this pull request


[submodule] [202012] Update sonic-swss pointer

3d6b064

* d240291 Update port_rates & rif_rates lua scripts to convert poll_interval to MS (sonic-net#1855)
* a71a5d3 [acl mirror action] Mirror session ref count fix at acl rule attachment (sonic-net#1761)
* 197f427 Fix vs test failure in test_buffer_traditional (sonic-net#1881)
* 8471f42 Revert "[debugcounterorch] check if counter type is supported before querying… (sonic-net#1789)" (sonic-net#1884)

Signed-off-by: Volodymyr Samotiy <volodymyrs@nvidia.com>

volodymyrsamotiy mentioned this pull request

[submodule] [202012] Update sonic-swss pointer #8676

Merged

5 tasks

prsunny pushed a commit that referenced this pull request


[submodule] [202012] Update sonic-swss pointer (#8676)

ab07ba2

* d240291 Update port_rates & rif_rates lua scripts to convert poll_interval to MS (#1855)
* a71a5d3 [acl mirror action] Mirror session ref count fix at acl rule attachment (#1761)
* 197f427 Fix vs test failure in test_buffer_traditional (#1881)
* 8471f42 Revert "[debugcounterorch] check if counter type is supported before querying… (#1789)" (#1884)

Signed-off-by: Volodymyr Samotiy <volodymyrs@nvidia.com>

volodymyrsamotiy added a commit to volodymyrsamotiy/sonic-buildimage that referenced this pull request


[submodule] [202012] Update sonic-utilities pointer

233db19

* d03ba4f [202012] [portstat, intfstat] added rates and utilization  (sonic-net#1812)
* 499ad3f [config reload] Fix config reload failure due to sonic.target job cancellation (sonic-net#1814)
* 96d658c [202012][sonic installer] Add swap setup support (sonic-net#1815)
* a9c6970 platform pre-check for reboot in 202012 branch (sonic-net#1788)
* 0e0478b Unify the number format in the ourput of portstat and pfcstat in all cases (sonic-net#1795)
* 2d1e00e [ecnconfig] Fix exception seen during display and add unit tests (sonic-net#1784) (sonic-net#1789)

Signed-off-by: Volodymyr Samotiy <volodymyrs@nvidia.com>

vivekrnv added a commit to vivekrnv/sonic-buildimage that referenced this pull request


Update submodule

f4b8b75

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)

lguohan pushed a commit that referenced this pull request


[submodule] [202012] Update sonic-utilities pointer (#8677)

5bf81f8

* d03ba4f [202012] [portstat, intfstat] added rates and utilization  (#1812)
* 499ad3f [config reload] Fix config reload failure due to sonic.target job cancellation (#1814)
* 96d658c [202012][sonic installer] Add swap setup support (#1815)
* a9c6970 platform pre-check for reboot in 202012 branch (#1788)
* 0e0478b Unify the number format in the ourput of portstat and pfcstat in all cases (#1795)
* 2d1e00e [ecnconfig] Fix exception seen during display and add unit tests (#1784) (#1789)

Signed-off-by: Volodymyr Samotiy <volodymyrs@nvidia.com>

theasianpianist pushed a commit to theasianpianist/sonic-buildimage that referenced this pull request


[debugcounterorch] check if counter type is supported before querying… (

ed6786d

sonic-net#1789)

* [debugcounterorch] check if counter type is supported before querying object availability count
Signed-off-by: Stepan Blyschak <stepanb@nvidia.com>

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment