-
Notifications
You must be signed in to change notification settings - Fork 113
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
chore(sysfs,probe): backport sysfs probe to v0.4.x (#395)
- add sysfs probe - remove capacity probe - add logical block size, physical block size, hardware sector size and drive type - use smartprobe to fill in capacity only if sysfs probe fails to fetch capacity Signed-off-by: Akhil Mohan <akhil.mohan@mayadata.io>
- Loading branch information
Showing
10 changed files
with
211 additions
and
140 deletions.
There are no files selected for viewing
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
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 was deleted.
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
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
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,172 @@ | ||
| /* | ||
| Copyright 2020 OpenEBS 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. | ||
| */ | ||
|
|
||
| /* | ||
| Find queue sysfs doc here. | ||
| https://www.kernel.org/doc/Documentation/block/queue-sysfs.txt | ||
| */ | ||
|
|
||
| package probe | ||
|
|
||
| import ( | ||
| "io/ioutil" | ||
| "strconv" | ||
| "strings" | ||
|
|
||
| "github.com/openebs/node-disk-manager/cmd/ndm_daemonset/controller" | ||
| "github.com/openebs/node-disk-manager/pkg/util" | ||
| "k8s.io/klog" | ||
| ) | ||
|
|
||
| const ( | ||
| sysfsProbePriority = 2 | ||
| sysfsConfigKey = "sysfs-probe" | ||
| // sectorSize is the sector size as understood by the unix systems. | ||
| // It is kept as 512 bytes. all entries in /sys/class/block/sda/size | ||
| // are in 512 byte blocks | ||
| sectorSize int64 = 512 | ||
| ) | ||
|
|
||
| var ( | ||
| sysfsProbeName = "sysfs probe" | ||
| sysfsProbeState = defaultEnabled | ||
| ) | ||
|
|
||
| var sysfsProbeRegister = func() { | ||
| ctrl := <-controller.ControllerBroadcastChannel | ||
| if ctrl == nil { | ||
| klog.Error("unable to configure", sysfsProbeName) | ||
| return | ||
| } | ||
| if ctrl.NDMConfig != nil { | ||
| for _, probeConfig := range ctrl.NDMConfig.ProbeConfigs { | ||
| if probeConfig.Key == sysfsConfigKey { | ||
| sysfsProbeName = probeConfig.Name | ||
| sysfsProbeState = util.CheckTruthy(probeConfig.State) | ||
| break | ||
| } | ||
| } | ||
| } | ||
|
|
||
| newRegistryProbe := ®isterProbe{ | ||
| priority: sysfsProbePriority, | ||
| name: sysfsProbeName, | ||
| state: sysfsProbeState, | ||
| pi: newSysFSProbe(), | ||
| controller: ctrl, | ||
| } | ||
| newRegistryProbe.register() | ||
| } | ||
|
|
||
| // sysfsProbe fills the logical sector size, | ||
| // physical sector size, drive type(ssd or hdd) of the disk | ||
| type sysfsProbe struct { | ||
| } | ||
|
|
||
| func newSysFSProbe() *sysfsProbe { | ||
| return &sysfsProbe{} | ||
| } | ||
|
|
||
| // It is part of probe interface. Hence, empty implementation. | ||
| func (cp *sysfsProbe) Start() {} | ||
|
|
||
| // FillDiskDetails updates the logical sector size, | ||
| // physical sector size, drive type(ssd or hdd) of the disk | ||
| // if those are not populated. | ||
| func (cp *sysfsProbe) FillDiskDetails(d *controller.DiskInfo) { | ||
| sysPath := d.ProbeIdentifiers.UdevIdentifier | ||
|
|
||
| if d.LogicalSectorSize == 0 { | ||
| logicalBlockSize, err := readSysFSFileAsInt64(sysPath + "/queue/logical_block_size") | ||
| if err != nil { | ||
| klog.Warning("unable to read logical block size", err) | ||
| } else if logicalBlockSize != 0 { | ||
| d.LogicalSectorSize = uint32(logicalBlockSize) | ||
| klog.V(4).Infof("Disk: %s logical block size: %d filled by sysfs probe.", | ||
| d.Path, d.LogicalSectorSize) | ||
| } | ||
| } | ||
|
|
||
| if d.PhysicalSectorSize == 0 { | ||
| physicalBlockSize, err := readSysFSFileAsInt64(sysPath + "/queue/physical_block_size") | ||
| if err != nil { | ||
| klog.Warning("unable to read physical block size", err) | ||
| } else if physicalBlockSize != 0 { | ||
| d.PhysicalSectorSize = uint32(physicalBlockSize) | ||
| klog.V(4).Infof("Disk: %s physical block size :%d filled by sysfs probe.", | ||
| d.Path, d.PhysicalSectorSize) | ||
| } | ||
| } | ||
|
|
||
| if d.HardwareSectorSize == 0 { | ||
| hwSectorSize, err := readSysFSFileAsInt64(sysPath + "/queue/hw_sector_size") | ||
| if err != nil { | ||
| klog.Warning("unable to read hardware sector size", err) | ||
| } else if hwSectorSize != 0 { | ||
| d.HardwareSectorSize = uint32(hwSectorSize) | ||
| klog.V(4).Infof("Disk: %s hardware sector size :%d filled by sysfs probe.", | ||
| d.Path, d.HardwareSectorSize) | ||
| } | ||
| } | ||
|
|
||
| if d.DriveType == "" { | ||
| rotational, err := readSysFSFileAsInt64(sysPath + "/queue/rotational") | ||
| if err != nil { | ||
| klog.Warning("unable to read rotational value", err) | ||
| } else { | ||
| if rotational == 1 { | ||
| d.DriveType = "HDD" | ||
|
|
||
| } else if rotational == 0 { | ||
| d.DriveType = "SSD" | ||
| } | ||
| klog.V(4).Infof("Disk path: %s drive type :%s filled by sysfs probe.", | ||
| d.Path, d.DriveType) | ||
| } | ||
| } | ||
|
|
||
| if d.Capacity == 0 { | ||
| // The size (/size) entry returns the `nr_sects` field of the block device structure. | ||
| // Ref: https://elixir.bootlin.com/linux/v4.4/source/fs/block_dev.c#L1267 | ||
| // | ||
| // Traditionally, in Unix disk size contexts, “sector” or “block” means 512 bytes, | ||
| // regardless of what the manufacturer of the underlying hardware might call a “sector” or “block” | ||
| // Ref: https://elixir.bootlin.com/linux/v4.4/source/fs/block_dev.c#L487 | ||
| // | ||
| // Therefore, to get the capacity of the device it needs to always multiplied with 512 | ||
| numberOfBlocks, err := readSysFSFileAsInt64(sysPath + "/size") | ||
| if err != nil { | ||
| klog.Warning("unable to block count", err) | ||
| return | ||
| } else if numberOfBlocks != 0 { | ||
| d.Capacity = uint64(numberOfBlocks * sectorSize) | ||
| klog.V(4).Infof("Disk path: %s capacity :%d filled by sysfs probe.", | ||
| d.Path, d.Capacity) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| // readSysFSFileAsInt64 reads a file and | ||
| // converts that content into int64 | ||
| func readSysFSFileAsInt64(sysPath string) (int64, error) { | ||
| b, err := ioutil.ReadFile(sysPath) | ||
| if err != nil { | ||
| return 0, err | ||
| } | ||
| return strconv.ParseInt(strings.TrimSuffix(string(b), "\n"), 10, 64) | ||
| } |
Oops, something went wrong.