fix IOCounters() SerialNumber enumeration #1508
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
shirou
reviewed
Aug 17, 2023
Co-authored-by: shirou <[email protected]>
dave-gray101
referenced
this pull request
in mudler/LocalAI
Sep 1, 2023
[](https://renovatebot.com) This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [github.com/shirou/gopsutil/v3](https://togithub.com/shirou/gopsutil) | require | patch | `v3.23.7` -> `v3.23.8` | --- ### Release Notes <details> <summary>shirou/gopsutil (github.com/shirou/gopsutil/v3)</summary> ### [`v3.23.8`](https://togithub.com/shirou/gopsutil/releases/tag/v3.23.8) [Compare Source](https://togithub.com/shirou/gopsutil/compare/v3.23.7...v3.23.8) <!-- Release notes generated using configuration in .github/release.yml at v3.23.8 --> #### What's Changed [#​1514](https://togithub.com/shirou/gopsutil/issues/1514) improves `Processes()` performance 6% or more. Thank you [@​atoulme](https://togithub.com/atoulme) ! ##### cpu - Enable setting of vendor and related information for all Power versions by [@​kishen-v](https://togithub.com/kishen-v) in [https://github.com/shirou/gopsutil/pull/1495](https://togithub.com/shirou/gopsutil/pull/1495) - chore: change CIRCLECI environment variable to CI. by [@​shirou](https://togithub.com/shirou) in [https://github.com/shirou/gopsutil/pull/1518](https://togithub.com/shirou/gopsutil/pull/1518) ##### disk - fix: fixed windows disk package leaks by [@​ozanh](https://togithub.com/ozanh) in [https://github.com/shirou/gopsutil/pull/1501](https://togithub.com/shirou/gopsutil/pull/1501) - fix IOCounters() SerialNumber enumeration by [@​gdvalle](https://togithub.com/gdvalle) in [https://github.com/shirou/gopsutil/pull/1508](https://togithub.com/shirou/gopsutil/pull/1508) ##### host - \[host]\[linux]: remove double quote from lsb release info by [@​shirou](https://togithub.com/shirou) in [https://github.com/shirou/gopsutil/pull/1504](https://togithub.com/shirou/gopsutil/pull/1504) ##### mem - mem: linux: fix vmstat field names by [@​chouquette](https://togithub.com/chouquette) in [https://github.com/shirou/gopsutil/pull/1498](https://togithub.com/shirou/gopsutil/pull/1498) ##### process - Fix Processes() calls with many cores by [@​atoulme](https://togithub.com/atoulme) in [https://github.com/shirou/gopsutil/pull/1514](https://togithub.com/shirou/gopsutil/pull/1514) #### New Contributors - [@​kishen-v](https://togithub.com/kishen-v) made their first contribution in [https://github.com/shirou/gopsutil/pull/1495](https://togithub.com/shirou/gopsutil/pull/1495) - [@​chouquette](https://togithub.com/chouquette) made their first contribution in [https://github.com/shirou/gopsutil/pull/1498](https://togithub.com/shirou/gopsutil/pull/1498) - [@​ozanh](https://togithub.com/ozanh) made their first contribution in [https://github.com/shirou/gopsutil/pull/1501](https://togithub.com/shirou/gopsutil/pull/1501) - [@​gdvalle](https://togithub.com/gdvalle) made their first contribution in [https://github.com/shirou/gopsutil/pull/1508](https://togithub.com/shirou/gopsutil/pull/1508) **Full Changelog**: shirou/gopsutil@v3.23.7...v3.23.8 </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/go-skynet/LocalAI). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNi42OC4xIiwidXBkYXRlZEluVmVyIjoiMzYuNjguMSIsInRhcmdldEJyYW5jaCI6Im1hc3RlciJ9--> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
](https://renovatebot.com){kind=link}
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Addresses #1139.
I think @jbliao's analysis was correct. We end up basename-ing the device names passed in, so
/dev/sda->sda, and then we try to look up the serial number usingsda, but the first thing that happens is aunix.Stat("sda"), which errors silently here.Because the API is this way, just prepend a hardcoded
/dev/to the device name so this lookup can succeed. I think this has a minimal chance for breakage.Alternatively, we could maybe check for a leading
/in theSerialNumber()func, and prepend/dev/there. Probably also pretty safe, and does improve the API usability.