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

fix IOCounters() SerialNumber enumeration #1508

Merged
merged 4 commits into from Aug 20, 2023

Conversation

gdvalle
Copy link
Contributor

@gdvalle gdvalle commented Aug 17, 2023

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 using sda, but the first thing that happens is a unix.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 the SerialNumber() func, and prepend /dev/ there. Probably also pretty safe, and does improve the API usability.

disk/disk_linux.go Outdated Show resolved Hide resolved
gdvalle and others added 2 commits August 17, 2023 09:37
Co-authored-by: shirou <shirou.faw@gmail.com>
@gdvalle gdvalle requested a review from shirou August 17, 2023 14:53
Copy link
Owner

@shirou shirou left a comment

Choose a reason for hiding this comment

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

Great, Thank you so much!

@shirou shirou merged commit 6084c1e into shirou:master Aug 20, 2023
19 checks passed
dave-gray101 pushed a commit to mudler/LocalAI that referenced this pull request Sep 1, 2023
[![Mend
Renovate](https://app.renovatebot.com/images/banner.svg)](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

[#&#8203;1514](https://togithub.com/shirou/gopsutil/issues/1514)
improves `Processes()` performance 6% or more. Thank you
[@&#8203;atoulme](https://togithub.com/atoulme) !

##### cpu

- Enable setting of vendor and related information for all Power
versions by [@&#8203;kishen-v](https://togithub.com/kishen-v) in
[shirou/gopsutil#1495
- chore: change CIRCLECI environment variable to CI. by
[@&#8203;shirou](https://togithub.com/shirou) in
[shirou/gopsutil#1518

##### disk

- fix: fixed windows disk package leaks by
[@&#8203;ozanh](https://togithub.com/ozanh) in
[shirou/gopsutil#1501
- fix IOCounters() SerialNumber enumeration by
[@&#8203;gdvalle](https://togithub.com/gdvalle) in
[shirou/gopsutil#1508

##### host

- \[host]\[linux]: remove double quote from lsb release info by
[@&#8203;shirou](https://togithub.com/shirou) in
[shirou/gopsutil#1504

##### mem

- mem: linux: fix vmstat field names by
[@&#8203;chouquette](https://togithub.com/chouquette) in
[shirou/gopsutil#1498

##### process

- Fix Processes() calls with many cores by
[@&#8203;atoulme](https://togithub.com/atoulme) in
[shirou/gopsutil#1514

#### New Contributors

- [@&#8203;kishen-v](https://togithub.com/kishen-v) made their first
contribution in
[shirou/gopsutil#1495
- [@&#8203;chouquette](https://togithub.com/chouquette) made their first
contribution in
[shirou/gopsutil#1498
- [@&#8203;ozanh](https://togithub.com/ozanh) made their first
contribution in
[shirou/gopsutil#1501
- [@&#8203;gdvalle](https://togithub.com/gdvalle) made their first
contribution in
[shirou/gopsutil#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>
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.

None yet

2 participants