forked from cockroachdb/cockroach
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
27930: server: fix crash when getting disk stats on mac r=vilterp a=vilterp The hardware stats library, gopsutil, uses unguarded shared mutable state on darwin while gathering disk stats. Thus, it crashes during the tests, which use many servers concurrently. This change uses a different library to gather these stats on darwin. Fixes cockroachdb#27867 Release note: None Co-authored-by: Pete Vilter <[email protected]>
- Loading branch information
Showing
6 changed files
with
191 additions
and
84 deletions.
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,47 @@ | ||
| // Copyright 2018 The Cockroach Authors. | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or | ||
| // implied. See the License for the specific language governing | ||
| // permissions and limitations under the License. | ||
|
|
||
| // +build !darwin | ||
|
|
||
| package status | ||
|
|
||
| import ( | ||
| "context" | ||
|
|
||
| "github.com/shirou/gopsutil/disk" | ||
| ) | ||
|
|
||
| func getDiskCounters(ctx context.Context) ([]diskStats, error) { | ||
| driveStats, err := disk.IOCountersWithContext(ctx) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| output := make([]diskStats, len(driveStats)) | ||
| i := 0 | ||
| for _, counters := range driveStats { | ||
| output[i] = diskStats{ | ||
| readBytes: int64(counters.ReadBytes), | ||
| readTimeMs: int64(counters.ReadTime), | ||
| readCount: int64(counters.ReadCount), | ||
| writeBytes: int64(counters.WriteBytes), | ||
| writeTimeMs: int64(counters.WriteTime), | ||
| writeCount: int64(counters.WriteCount), | ||
| iopsInProgress: int64(counters.IopsInProgress), | ||
| } | ||
| i++ | ||
| } | ||
|
|
||
| return output, nil | ||
| } |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,45 @@ | ||
| // Copyright 2018 The Cockroach Authors. | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or | ||
| // implied. See the License for the specific language governing | ||
| // permissions and limitations under the License. | ||
|
|
||
| // +build darwin | ||
|
|
||
| package status | ||
|
|
||
| import ( | ||
| "context" | ||
|
|
||
| "github.com/lufia/iostat" | ||
| ) | ||
|
|
||
| func getDiskCounters(context.Context) ([]diskStats, error) { | ||
| driveStats, err := iostat.ReadDriveStats() | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| output := make([]diskStats, len(driveStats)) | ||
| for i, counters := range driveStats { | ||
| output[i] = diskStats{ | ||
| readBytes: counters.BytesRead, | ||
| readCount: counters.NumRead, | ||
| readTimeMs: int64(counters.TotalReadTime), | ||
| writeBytes: counters.BytesWritten, | ||
| writeCount: counters.NumWrite, | ||
| writeTimeMs: int64(counters.TotalWriteTime), | ||
| iopsInProgress: 0, // Not reported by this library. (#27927) | ||
| } | ||
| } | ||
|
|
||
| return output, nil | ||
| } |
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
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
Submodule vendor
updated
8 files