diff --git a/cmd/admin-handlers.go b/cmd/admin-handlers.go index 0e902192d..2a844841c 100644 --- a/cmd/admin-handlers.go +++ b/cmd/admin-handlers.go @@ -398,8 +398,21 @@ func (a adminAPIHandlers) MetricsHandler(w http.ResponseWriter, r *http.Request) } else { types = madmin.MetricsAll } + + disks := strings.Split(r.Form.Get("disks"), ",") + byDisk := strings.EqualFold(r.Form.Get("by-disk"), "true") + var diskMap map[string]struct{} + if len(disks) > 0 && disks[0] != "" { + diskMap = make(map[string]struct{}, len(disks)) + for _, k := range disks { + if k != "" { + diskMap[k] = struct{}{} + } + } + } + hosts := strings.Split(r.Form.Get("hosts"), ",") - byhost := strings.EqualFold(r.Form.Get("by-host"), "true") + byHost := strings.EqualFold(r.Form.Get("by-host"), "true") var hostMap map[string]struct{} if len(hosts) > 0 && hosts[0] != "" { hostMap = make(map[string]struct{}, len(hosts)) @@ -409,6 +422,7 @@ func (a adminAPIHandlers) MetricsHandler(w http.ResponseWriter, r *http.Request) } } } + done := ctx.Done() ticker := time.NewTicker(interval) defer ticker.Stop() @@ -416,17 +430,20 @@ func (a adminAPIHandlers) MetricsHandler(w http.ResponseWriter, r *http.Request) for n > 0 { var m madmin.RealtimeMetrics - mLocal := collectLocalMetrics(types, hostMap) + mLocal := collectLocalMetrics(types, hostMap, diskMap) m.Merge(&mLocal) // Allow half the interval for collecting remote... cctx, cancel := context.WithTimeout(ctx, interval/2) - mRemote := collectRemoteMetrics(cctx, types, hostMap) + mRemote := collectRemoteMetrics(cctx, types, hostMap, diskMap) cancel() m.Merge(&mRemote) - if !byhost { + if !byHost { m.ByHost = nil } + if !byDisk { + m.ByDisk = nil + } m.Final = n <= 1 // Marshal API response diff --git a/cmd/erasure.go b/cmd/erasure.go index 9697fbddf..a55cfe9b2 100644 --- a/cmd/erasure.go +++ b/cmd/erasure.go @@ -201,8 +201,11 @@ func getDisksInfo(disks []StorageAPI, endpoints []Endpoint) (disksInfo []madmin. UsedSpace: info.Used, AvailableSpace: info.Free, UUID: info.ID, + Major: info.Major, + Minor: info.Minor, RootDisk: info.RootDisk, Healing: info.Healing, + Scanning: info.Scanning, State: diskErrToDriveState(err), FreeInodes: info.FreeInodes, } diff --git a/cmd/metrics-realtime.go b/cmd/metrics-realtime.go index 72ec29678..4f948da23 100644 --- a/cmd/metrics-realtime.go +++ b/cmd/metrics-realtime.go @@ -22,24 +22,36 @@ import ( "time" "github.com/minio/madmin-go" + "github.com/minio/minio/internal/disk" ) -func collectLocalMetrics(types madmin.MetricType, hosts map[string]struct{}) (m madmin.RealtimeMetrics) { +func collectLocalMetrics(types madmin.MetricType, hosts map[string]struct{}, disks map[string]struct{}) (m madmin.RealtimeMetrics) { if types == madmin.MetricsNone { return } + if len(hosts) > 0 { if _, ok := hosts[globalMinioAddr]; !ok { return } } + + if types.Contains(madmin.MetricsDisk) && !globalIsGateway { + m.ByDisk = make(map[string]madmin.DiskMetric) + aggr := madmin.DiskMetric{ + CollectedAt: time.Now(), + } + for name, disk := range collectLocalDisksMetrics(disks) { + m.ByDisk[name] = disk + aggr.Merge(&disk) + } + m.Aggregated.Disk = &aggr + } + if types.Contains(madmin.MetricsScanner) { metrics := globalScannerMetrics.report() m.Aggregated.Scanner = &metrics } - if types.Contains(madmin.MetricsDisk) && !globalIsGateway { - m.Aggregated.Disk = collectDiskMetrics() - } if types.Contains(madmin.MetricsOS) { metrics := globalOSMetrics.report() m.Aggregated.OS = &metrics @@ -53,55 +65,89 @@ func collectLocalMetrics(types madmin.MetricType, hosts map[string]struct{}) (m return m } -func collectDiskMetrics() *madmin.DiskMetric { +func collectLocalDisksMetrics(disks map[string]struct{}) map[string]madmin.DiskMetric { objLayer := newObjectLayerFn() - disks := madmin.DiskMetric{ - CollectedAt: time.Now(), - } - if objLayer == nil { return nil } + + metrics := make(map[string]madmin.DiskMetric) + + procStats, procErr := disk.GetAllDrivesIOStats() + if procErr != nil { + return metrics + } + // only need Disks information in server mode. storageInfo, errs := objLayer.LocalStorageInfo(GlobalContext) - for _, err := range errs { - if err != nil { - disks.Merge(&madmin.DiskMetric{NDisks: 1, Offline: 1}) + + for i, d := range storageInfo.Disks { + if len(disks) != 0 { + _, ok := disks[d.Endpoint] + if !ok { + continue + } } - } - for i, disk := range storageInfo.Disks { + if errs[i] != nil { + metrics[d.Endpoint] = madmin.DiskMetric{NDisks: 1, Offline: 1} continue } - var d madmin.DiskMetric - d.NDisks = 1 - if disk.Healing { - d.Healing++ + + var dm madmin.DiskMetric + dm.NDisks = 1 + if d.Healing { + dm.Healing++ } - if disk.Metrics != nil { - d.LifeTimeOps = make(map[string]uint64, len(disk.Metrics.APICalls)) - for k, v := range disk.Metrics.APICalls { + if d.Metrics != nil { + dm.LifeTimeOps = make(map[string]uint64, len(d.Metrics.APICalls)) + for k, v := range d.Metrics.APICalls { if v != 0 { - d.LifeTimeOps[k] = v + dm.LifeTimeOps[k] = v } } - d.LastMinute.Operations = make(map[string]madmin.TimedAction, len(disk.Metrics.APICalls)) - for k, v := range disk.Metrics.LastMinute { + dm.LastMinute.Operations = make(map[string]madmin.TimedAction, len(d.Metrics.APICalls)) + for k, v := range d.Metrics.LastMinute { if v.Count != 0 { - d.LastMinute.Operations[k] = v + dm.LastMinute.Operations[k] = v } } } - disks.Merge(&d) + + // get disk + if procErr == nil { + st := procStats[disk.DevID{Major: d.Major, Minor: d.Minor}] + dm.IOStats = madmin.DiskIOStats{ + ReadIOs: st.ReadIOs, + ReadMerges: st.ReadMerges, + ReadSectors: st.ReadSectors, + ReadTicks: st.ReadTicks, + WriteIOs: st.WriteIOs, + WriteMerges: st.WriteMerges, + WriteSectors: st.WriteSectors, + WriteTicks: st.WriteTicks, + CurrentIOs: st.CurrentIOs, + TotalTicks: st.TotalTicks, + ReqTicks: st.ReqTicks, + DiscardIOs: st.DiscardIOs, + DiscardMerges: st.DiscardMerges, + DiscardSectors: st.DiscardSectors, + DiscardTicks: st.DiscardTicks, + FlushIOs: st.FlushIOs, + FlushTicks: st.FlushTicks, + } + } + + metrics[d.Endpoint] = dm } - return &disks + return metrics } -func collectRemoteMetrics(ctx context.Context, types madmin.MetricType, hosts map[string]struct{}) (m madmin.RealtimeMetrics) { +func collectRemoteMetrics(ctx context.Context, types madmin.MetricType, hosts map[string]struct{}, disks map[string]struct{}) (m madmin.RealtimeMetrics) { if !globalIsDistErasure { return } - all := globalNotificationSys.GetMetrics(ctx, types, hosts) + all := globalNotificationSys.GetMetrics(ctx, types, hosts, disks) for _, remote := range all { m.Merge(&remote) } diff --git a/cmd/notification.go b/cmd/notification.go index 978748847..d2da447ba 100644 --- a/cmd/notification.go +++ b/cmd/notification.go @@ -904,7 +904,7 @@ func (sys *NotificationSys) GetOSInfo(ctx context.Context) []madmin.OSInfo { } // GetMetrics - Get metrics from all peers. -func (sys *NotificationSys) GetMetrics(ctx context.Context, t madmin.MetricType, hosts map[string]struct{}) []madmin.RealtimeMetrics { +func (sys *NotificationSys) GetMetrics(ctx context.Context, t madmin.MetricType, hosts map[string]struct{}, disks map[string]struct{}) []madmin.RealtimeMetrics { reply := make([]madmin.RealtimeMetrics, len(sys.peerClients)) g := errgroup.WithNErrs(len(sys.peerClients)) @@ -922,7 +922,7 @@ func (sys *NotificationSys) GetMetrics(ctx context.Context, t madmin.MetricType, index := index g.Go(func() error { var err error - reply[index], err = sys.peerClients[index].GetMetrics(ctx, t) + reply[index], err = sys.peerClients[index].GetMetrics(ctx, t, disks) return err }, index) } diff --git a/cmd/peer-rest-client.go b/cmd/peer-rest-client.go index f392d5494..fc69161e2 100644 --- a/cmd/peer-rest-client.go +++ b/cmd/peer-rest-client.go @@ -195,9 +195,12 @@ func (client *peerRESTClient) GetMemInfo(ctx context.Context) (info madmin.MemIn } // GetMetrics - fetch metrics from a remote node. -func (client *peerRESTClient) GetMetrics(ctx context.Context, t madmin.MetricType) (info madmin.RealtimeMetrics, err error) { +func (client *peerRESTClient) GetMetrics(ctx context.Context, t madmin.MetricType, diskMap map[string]struct{}) (info madmin.RealtimeMetrics, err error) { values := make(url.Values) values.Set(peerRESTTypes, strconv.FormatUint(uint64(t), 10)) + for disk := range diskMap { + values.Set(peerRESTDisk, disk) + } respBody, err := client.callWithContext(ctx, peerRESTMethodMetrics, values, nil, -1) if err != nil { return diff --git a/cmd/peer-rest-common.go b/cmd/peer-rest-common.go index 514eef9c3..3ea5257b2 100644 --- a/cmd/peer-rest-common.go +++ b/cmd/peer-rest-common.go @@ -18,7 +18,7 @@ package cmd const ( - peerRESTVersion = "v24" // Change ServerUpdate to DownloadBinary and CommitBinary + peerRESTVersion = "v25" // Update /metrics peerRESTVersionPrefix = SlashSeparator + peerRESTVersion peerRESTPrefix = minioReservedBucketPath + "/peer" peerRESTPath = peerRESTPrefix + peerRESTVersionPrefix @@ -91,6 +91,7 @@ const ( peerRESTDuration = "duration" peerRESTStorageClass = "storage-class" peerRESTTypes = "types" + peerRESTDisk = "disk" peerRESTListenBucket = "bucket" peerRESTListenPrefix = "prefix" diff --git a/cmd/peer-rest-server.go b/cmd/peer-rest-server.go index 0fef48c51..ea9f781eb 100644 --- a/cmd/peer-rest-server.go +++ b/cmd/peer-rest-server.go @@ -426,10 +426,17 @@ func (s *peerRESTServer) GetMetricsHandler(w http.ResponseWriter, r *http.Reques types = madmin.MetricsAll } + diskMap := make(map[string]struct{}) + if r.Form != nil { + for _, disk := range r.Form[peerRESTDisk] { + diskMap[disk] = struct{}{} + } + } + ctx, cancel := context.WithCancel(r.Context()) defer cancel() - info := collectLocalMetrics(types, nil) + info := collectLocalMetrics(types, nil, diskMap) logger.LogIf(ctx, gob.NewEncoder(w).Encode(info)) } diff --git a/cmd/storage-datatypes.go b/cmd/storage-datatypes.go index fb66d488e..48fa3ef1a 100644 --- a/cmd/storage-datatypes.go +++ b/cmd/storage-datatypes.go @@ -40,9 +40,12 @@ type DiskInfo struct { Used uint64 UsedInodes uint64 FreeInodes uint64 + Major uint32 + Minor uint32 FSType string RootDisk bool Healing bool + Scanning bool Endpoint string MountPath string ID string diff --git a/cmd/storage-datatypes_gen.go b/cmd/storage-datatypes_gen.go index 433d49686..3744284b2 100644 --- a/cmd/storage-datatypes_gen.go +++ b/cmd/storage-datatypes_gen.go @@ -14,8 +14,8 @@ func (z *DiskInfo) DecodeMsg(dc *msgp.Reader) (err error) { err = msgp.WrapError(err) return } - if zb0001 != 13 { - err = msgp.ArrayError{Wanted: 13, Got: zb0001} + if zb0001 != 16 { + err = msgp.ArrayError{Wanted: 16, Got: zb0001} return } z.Total, err = dc.ReadUint64() @@ -43,6 +43,16 @@ func (z *DiskInfo) DecodeMsg(dc *msgp.Reader) (err error) { err = msgp.WrapError(err, "FreeInodes") return } + z.Major, err = dc.ReadUint32() + if err != nil { + err = msgp.WrapError(err, "Major") + return + } + z.Minor, err = dc.ReadUint32() + if err != nil { + err = msgp.WrapError(err, "Minor") + return + } z.FSType, err = dc.ReadString() if err != nil { err = msgp.WrapError(err, "FSType") @@ -58,6 +68,11 @@ func (z *DiskInfo) DecodeMsg(dc *msgp.Reader) (err error) { err = msgp.WrapError(err, "Healing") return } + z.Scanning, err = dc.ReadBool() + if err != nil { + err = msgp.WrapError(err, "Scanning") + return + } z.Endpoint, err = dc.ReadString() if err != nil { err = msgp.WrapError(err, "Endpoint") @@ -88,8 +103,8 @@ func (z *DiskInfo) DecodeMsg(dc *msgp.Reader) (err error) { // EncodeMsg implements msgp.Encodable func (z *DiskInfo) EncodeMsg(en *msgp.Writer) (err error) { - // array header, size 13 - err = en.Append(0x9d) + // array header, size 16 + err = en.Append(0xdc, 0x0, 0x10) if err != nil { return } @@ -118,6 +133,16 @@ func (z *DiskInfo) EncodeMsg(en *msgp.Writer) (err error) { err = msgp.WrapError(err, "FreeInodes") return } + err = en.WriteUint32(z.Major) + if err != nil { + err = msgp.WrapError(err, "Major") + return + } + err = en.WriteUint32(z.Minor) + if err != nil { + err = msgp.WrapError(err, "Minor") + return + } err = en.WriteString(z.FSType) if err != nil { err = msgp.WrapError(err, "FSType") @@ -133,6 +158,11 @@ func (z *DiskInfo) EncodeMsg(en *msgp.Writer) (err error) { err = msgp.WrapError(err, "Healing") return } + err = en.WriteBool(z.Scanning) + if err != nil { + err = msgp.WrapError(err, "Scanning") + return + } err = en.WriteString(z.Endpoint) if err != nil { err = msgp.WrapError(err, "Endpoint") @@ -164,16 +194,19 @@ func (z *DiskInfo) EncodeMsg(en *msgp.Writer) (err error) { // MarshalMsg implements msgp.Marshaler func (z *DiskInfo) MarshalMsg(b []byte) (o []byte, err error) { o = msgp.Require(b, z.Msgsize()) - // array header, size 13 - o = append(o, 0x9d) + // array header, size 16 + o = append(o, 0xdc, 0x0, 0x10) o = msgp.AppendUint64(o, z.Total) o = msgp.AppendUint64(o, z.Free) o = msgp.AppendUint64(o, z.Used) o = msgp.AppendUint64(o, z.UsedInodes) o = msgp.AppendUint64(o, z.FreeInodes) + o = msgp.AppendUint32(o, z.Major) + o = msgp.AppendUint32(o, z.Minor) o = msgp.AppendString(o, z.FSType) o = msgp.AppendBool(o, z.RootDisk) o = msgp.AppendBool(o, z.Healing) + o = msgp.AppendBool(o, z.Scanning) o = msgp.AppendString(o, z.Endpoint) o = msgp.AppendString(o, z.MountPath) o = msgp.AppendString(o, z.ID) @@ -194,8 +227,8 @@ func (z *DiskInfo) UnmarshalMsg(bts []byte) (o []byte, err error) { err = msgp.WrapError(err) return } - if zb0001 != 13 { - err = msgp.ArrayError{Wanted: 13, Got: zb0001} + if zb0001 != 16 { + err = msgp.ArrayError{Wanted: 16, Got: zb0001} return } z.Total, bts, err = msgp.ReadUint64Bytes(bts) @@ -223,6 +256,16 @@ func (z *DiskInfo) UnmarshalMsg(bts []byte) (o []byte, err error) { err = msgp.WrapError(err, "FreeInodes") return } + z.Major, bts, err = msgp.ReadUint32Bytes(bts) + if err != nil { + err = msgp.WrapError(err, "Major") + return + } + z.Minor, bts, err = msgp.ReadUint32Bytes(bts) + if err != nil { + err = msgp.WrapError(err, "Minor") + return + } z.FSType, bts, err = msgp.ReadStringBytes(bts) if err != nil { err = msgp.WrapError(err, "FSType") @@ -238,6 +281,11 @@ func (z *DiskInfo) UnmarshalMsg(bts []byte) (o []byte, err error) { err = msgp.WrapError(err, "Healing") return } + z.Scanning, bts, err = msgp.ReadBoolBytes(bts) + if err != nil { + err = msgp.WrapError(err, "Scanning") + return + } z.Endpoint, bts, err = msgp.ReadStringBytes(bts) if err != nil { err = msgp.WrapError(err, "Endpoint") @@ -269,7 +317,7 @@ func (z *DiskInfo) UnmarshalMsg(bts []byte) (o []byte, err error) { // Msgsize returns an upper bound estimate of the number of bytes occupied by the serialized message func (z *DiskInfo) Msgsize() (s int) { - s = 1 + msgp.Uint64Size + msgp.Uint64Size + msgp.Uint64Size + msgp.Uint64Size + msgp.Uint64Size + msgp.StringPrefixSize + len(z.FSType) + msgp.BoolSize + msgp.BoolSize + msgp.StringPrefixSize + len(z.Endpoint) + msgp.StringPrefixSize + len(z.MountPath) + msgp.StringPrefixSize + len(z.ID) + z.Metrics.Msgsize() + msgp.StringPrefixSize + len(z.Error) + s = 3 + msgp.Uint64Size + msgp.Uint64Size + msgp.Uint64Size + msgp.Uint64Size + msgp.Uint64Size + msgp.Uint32Size + msgp.Uint32Size + msgp.StringPrefixSize + len(z.FSType) + msgp.BoolSize + msgp.BoolSize + msgp.BoolSize + msgp.StringPrefixSize + len(z.Endpoint) + msgp.StringPrefixSize + len(z.MountPath) + msgp.StringPrefixSize + len(z.ID) + z.Metrics.Msgsize() + msgp.StringPrefixSize + len(z.Error) return } diff --git a/cmd/xl-storage.go b/cmd/xl-storage.go index f22ccdb20..3e43b388f 100644 --- a/cmd/xl-storage.go +++ b/cmd/xl-storage.go @@ -32,6 +32,7 @@ import ( "runtime" "strings" "sync" + "sync/atomic" "syscall" "time" @@ -101,6 +102,9 @@ type xlStorage struct { // Indexes, will be -1 until assigned a set. poolIndex, setIndex, diskIndex int + // Indicate of NSScanner is in progress in this disk + scanning int32 + formatFileInfo os.FileInfo formatLegacy bool formatLastCheck time.Time @@ -423,6 +427,9 @@ func (s *xlStorage) readMetadata(ctx context.Context, itemPath string) ([]byte, } func (s *xlStorage) NSScanner(ctx context.Context, cache dataUsageCache, updates chan<- dataUsageEntry, scanMode madmin.HealScanMode) (dataUsageCache, error) { + atomic.AddInt32(&s.scanning, 1) + defer atomic.AddInt32(&s.scanning, -1) + // Updates must be closed before we return. defer close(updates) var lc *lifecycle.Lifecycle @@ -576,6 +583,8 @@ func (s *xlStorage) DiskInfo(context.Context) (info DiskInfo, err error) { if err != nil { return dcinfo, err } + dcinfo.Major = di.Major + dcinfo.Minor = di.Minor dcinfo.Total = di.Total dcinfo.Free = di.Free dcinfo.Used = di.Used @@ -587,6 +596,7 @@ func (s *xlStorage) DiskInfo(context.Context) (info DiskInfo, err error) { // - if we found an unformatted disk (no 'format.json') // - if we found healing tracker 'healing.bin' dcinfo.Healing = errors.Is(err, errUnformattedDisk) || (s.Healing() != nil) + dcinfo.Scanning = atomic.LoadInt32(&s.scanning) == 1 dcinfo.ID = diskID return dcinfo, err } diff --git a/internal/disk/disk.go b/internal/disk/disk.go index 73be8f159..4baa478eb 100644 --- a/internal/disk/disk.go +++ b/internal/disk/disk.go @@ -30,4 +30,36 @@ type Info struct { Files uint64 Ffree uint64 FSType string + Major uint32 + Minor uint32 +} + +// DevID is the drive major and minor ids +type DevID struct { + Major uint32 + Minor uint32 +} + +// AllDrivesIOStats is map between drive devices and IO stats +type AllDrivesIOStats map[DevID]IOStats + +// IOStats contains stats of a single drive +type IOStats struct { + ReadIOs uint64 + ReadMerges uint64 + ReadSectors uint64 + ReadTicks uint64 + WriteIOs uint64 + WriteMerges uint64 + WriteSectors uint64 + WriteTicks uint64 + CurrentIOs uint64 + TotalTicks uint64 + ReqTicks uint64 + DiscardIOs uint64 + DiscardMerges uint64 + DiscardSectors uint64 + DiscardTicks uint64 + FlushIOs uint64 + FlushTicks uint64 } diff --git a/internal/disk/stat_bsd.go b/internal/disk/stat_bsd.go index 06a0e9182..be64c208c 100644 --- a/internal/disk/stat_bsd.go +++ b/internal/disk/stat_bsd.go @@ -21,6 +21,7 @@ package disk import ( + "errors" "fmt" "syscall" ) @@ -46,3 +47,8 @@ func GetInfo(path string) (info Info, err error) { info.Used = info.Total - info.Free return info, nil } + +// GetAllDrivesIOStats returns IO stats of all drives found in the machine +func GetAllDrivesIOStats() (info AllDrivesIOStats, err error) { + return nil, errors.New("operation unsupported") +} diff --git a/internal/disk/stat_freebsd.go b/internal/disk/stat_freebsd.go index 5cb8ea982..82d6fc541 100644 --- a/internal/disk/stat_freebsd.go +++ b/internal/disk/stat_freebsd.go @@ -21,6 +21,7 @@ package disk import ( + "errors" "fmt" "syscall" ) @@ -46,3 +47,8 @@ func GetInfo(path string) (info Info, err error) { info.Used = info.Total - info.Free return info, nil } + +// GetAllDrivesIOStats returns IO stats of all drives found in the machine +func GetAllDrivesIOStats() (info AllDrivesIOStats, err error) { + return nil, errors.New("operation unsupported") +} diff --git a/internal/disk/stat_linux.go b/internal/disk/stat_linux.go index cb5ef9572..e489cfd22 100644 --- a/internal/disk/stat_linux.go +++ b/internal/disk/stat_linux.go @@ -21,8 +21,14 @@ package disk import ( + "bufio" "fmt" + "os" + "strconv" + "strings" "syscall" + + "golang.org/x/sys/unix" ) // GetInfo returns total and free bytes available in a directory, e.g. `/`. @@ -49,5 +55,138 @@ func GetInfo(path string) (info Info, err error) { return info, fmt.Errorf("detected free space (%d) > total drive space (%d), fs corruption at (%s). please run 'fsck'", info.Free, info.Total, path) } info.Used = info.Total - info.Free + + st := syscall.Stat_t{} + err = syscall.Stat(path, &st) + if err != nil { + return Info{}, err + } + //nolint:unconvert + devID := uint64(st.Dev) // Needed to support multiple GOARCHs + info.Major = unix.Major(devID) + info.Minor = unix.Minor(devID) return info, nil } + +const ( + statsPath = "/proc/diskstats" +) + +// GetAllDrivesIOStats returns IO stats of all drives found in the machine +func GetAllDrivesIOStats() (info AllDrivesIOStats, err error) { + proc, err := os.Open(statsPath) + if err != nil { + return nil, err + } + defer proc.Close() + + ret := make(AllDrivesIOStats) + + sc := bufio.NewScanner(proc) + for sc.Scan() { + line := sc.Text() + fields := strings.Fields(line) + if len(fields) < 11 { + continue + } + + var err error + var ds IOStats + + ds.ReadIOs, err = strconv.ParseUint((fields[3]), 10, 64) + if err != nil { + return ret, err + } + ds.ReadMerges, err = strconv.ParseUint((fields[4]), 10, 64) + if err != nil { + return ret, err + } + ds.ReadSectors, err = strconv.ParseUint((fields[5]), 10, 64) + if err != nil { + return ret, err + } + ds.ReadTicks, err = strconv.ParseUint((fields[6]), 10, 64) + if err != nil { + return ret, err + } + ds.WriteIOs, err = strconv.ParseUint((fields[7]), 10, 64) + if err != nil { + return ret, err + } + ds.WriteMerges, err = strconv.ParseUint((fields[8]), 10, 64) + if err != nil { + return ret, err + } + ds.WriteSectors, err = strconv.ParseUint((fields[9]), 10, 64) + if err != nil { + return ret, err + } + ds.WriteTicks, err = strconv.ParseUint((fields[10]), 10, 64) + if err != nil { + return ret, err + } + + if len(fields) > 11 { + ds.CurrentIOs, err = strconv.ParseUint((fields[11]), 10, 64) + if err != nil { + return ret, err + } + + ds.TotalTicks, err = strconv.ParseUint((fields[12]), 10, 64) + if err != nil { + return ret, err + } + ds.ReqTicks, err = strconv.ParseUint((fields[13]), 10, 64) + if err != nil { + return ret, err + } + } + + if len(fields) > 14 { + ds.DiscardIOs, err = strconv.ParseUint((fields[14]), 10, 64) + if err != nil { + return ret, err + } + ds.DiscardMerges, err = strconv.ParseUint((fields[15]), 10, 64) + if err != nil { + return ret, err + } + ds.DiscardSectors, err = strconv.ParseUint((fields[16]), 10, 64) + if err != nil { + return ret, err + } + ds.DiscardTicks, err = strconv.ParseUint((fields[17]), 10, 64) + if err != nil { + return ret, err + } + } + + if len(fields) > 18 { + ds.FlushIOs, err = strconv.ParseUint((fields[18]), 10, 64) + if err != nil { + return ret, err + } + ds.FlushTicks, err = strconv.ParseUint((fields[19]), 10, 64) + if err != nil { + return ret, err + } + } + + major, err := strconv.ParseUint((fields[0]), 10, 32) + if err != nil { + return ret, err + } + + minor, err := strconv.ParseUint((fields[1]), 10, 32) + if err != nil { + return ret, err + } + ret[DevID{uint32(major), uint32(minor)}] = ds + } + + if err := sc.Err(); err != nil { + return nil, err + } + + return ret, nil +} diff --git a/internal/disk/stat_linux_32bit.go b/internal/disk/stat_linux_32bit.go index 116398fa3..2ef9ddfd0 100644 --- a/internal/disk/stat_linux_32bit.go +++ b/internal/disk/stat_linux_32bit.go @@ -21,6 +21,7 @@ package disk import ( + "errors" "fmt" "strconv" "syscall" @@ -81,3 +82,8 @@ func GetInfo(path string) (info Info, err error) { info.Used = info.Total - info.Free return info, nil } + +// GetAllDrivesIOStats returns IO stats of all drives found in the machine +func GetAllDrivesIOStats() (info AllDrivesIOStats, err error) { + return nil, errors.New("operation unsupported") +} diff --git a/internal/disk/stat_linux_s390x.go b/internal/disk/stat_linux_s390x.go index be9d59049..05a2d4e57 100644 --- a/internal/disk/stat_linux_s390x.go +++ b/internal/disk/stat_linux_s390x.go @@ -21,6 +21,7 @@ package disk import ( + "errors" "fmt" "strconv" "syscall" @@ -81,3 +82,8 @@ func GetInfo(path string) (info Info, err error) { info.Used = info.Total - info.Free return info, nil } + +// GetAllDrivesIOStats returns IO stats of all drives found in the machine +func GetAllDrivesIOStats() (info AllDrivesIOStats, err error) { + return nil, errors.New("operation unsupported") +} diff --git a/internal/disk/stat_netbsd.go b/internal/disk/stat_netbsd.go index 90feb094d..fe0f84de3 100644 --- a/internal/disk/stat_netbsd.go +++ b/internal/disk/stat_netbsd.go @@ -21,6 +21,7 @@ package disk import ( + "errors" "fmt" "golang.org/x/sys/unix" @@ -46,3 +47,8 @@ func GetInfo(path string) (info Info, err error) { info.Used = info.Total - info.Free return info, nil } + +// GetAllDrivesIOStats returns IO stats of all drives found in the machine +func GetAllDrivesIOStats() (info AllDrivesIOStats, err error) { + return nil, errors.New("operation unsupported") +} diff --git a/internal/disk/stat_openbsd.go b/internal/disk/stat_openbsd.go index f7e50622e..3f1b137da 100644 --- a/internal/disk/stat_openbsd.go +++ b/internal/disk/stat_openbsd.go @@ -21,6 +21,7 @@ package disk import ( + "errors" "fmt" "syscall" ) @@ -46,3 +47,8 @@ func GetInfo(path string) (info Info, err error) { info.Used = info.Total - info.Free return info, nil } + +// GetAllDrivesIOStats returns IO stats of all drives found in the machine +func GetAllDrivesIOStats() (info AllDrivesIOStats, err error) { + return nil, errors.New("operation unsupported") +} diff --git a/internal/disk/stat_solaris.go b/internal/disk/stat_solaris.go index 293072c14..3e8d1197d 100644 --- a/internal/disk/stat_solaris.go +++ b/internal/disk/stat_solaris.go @@ -21,6 +21,7 @@ package disk import ( + "errors" "fmt" "golang.org/x/sys/unix" @@ -46,3 +47,8 @@ func GetInfo(path string) (info Info, err error) { info.Used = info.Total - info.Free return info, nil } + +// GetAllDrivesIOStats returns IO stats of all drives found in the machine +func GetAllDrivesIOStats() (info AllDrivesIOStats, err error) { + return nil, errors.New("operation unsupported") +} diff --git a/internal/disk/stat_windows.go b/internal/disk/stat_windows.go index 6237ba2db..053774c8d 100644 --- a/internal/disk/stat_windows.go +++ b/internal/disk/stat_windows.go @@ -21,6 +21,7 @@ package disk import ( + "errors" "fmt" "os" "syscall" @@ -106,3 +107,8 @@ func GetInfo(path string) (info Info, err error) { return info, nil } + +// GetAllDrivesIOStats returns IO stats of all drives found in the machine +func GetAllDrivesIOStats() (info AllDrivesIOStats, err error) { + return nil, errors.New("operation unsupported") +}