MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-03-30 09:13:41 -04:00
Code Issues Packages Projects Releases Wiki Activity

reorder-disks: Fix UID to UUID and add better error messages (#17292)

Browse Source
This commit is contained in:
Anis Eleuch 2023-05-26 23:03:31 +01:00 committed by GitHub
parent c839b64f6a
commit 563f667e30
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
docs/debugging/reorder-disks/main.go
View File

@ -97,7 +97,7 @@ type localDisk struct {
func getMajorMinor(path string) (string, error) { func getMajorMinor(path string) (string, error) {
var stat syscall.Stat_t var stat syscall.Stat_t
if err := syscall.Stat(path, &stat); err != nil { if err := syscall.Stat(path, &stat); err != nil {
return "", err return "", fmt.Errorf("unable to stat `%s`: %w", err)
} }
major := (stat.Dev & 0x00000000000fff00) >> 8 major := (stat.Dev & 0x00000000000fff00) >> 8
@ -158,14 +158,14 @@ func getDiskLocation(f format) (string, error) {
} }
} }
} }
return "", errors.New("disk not found") return "", errors.New("format.json is corrupted")
} }
func main() { func main() {
var node, args string var node, args string
flag.StringVar(&node, "filter-node", "", "Filter disks which belong to the given node") flag.StringVar(&node, "local-node-name", "", "the name of the local node")
flag.StringVar(&args, "args", "", "arguments passed to MinIO server") flag.StringVar(&args, "args", "", "arguments passed to MinIO server")
flag.Parse() flag.Parse()
@ -176,7 +176,7 @@ func main() {
} }
if len(localDisks) == 0 { if len(localDisks) == 0 {
log.Fatal("Fix --filter-node or/and --args to select local disks.") log.Fatal("Fix --local-node-name or/and --args to select local disks.")
} }
format, err := getFormatJSON(localDisks[0].path) format, err := getFormatJSON(localDisks[0].path)
@ -194,33 +194,40 @@ func main() {
expectedDisksName[fmt.Sprintf("%d-%d", disk.index/setSize, disk.index%setSize)] = disk.path expectedDisksName[fmt.Sprintf("%d-%d", disk.index/setSize, disk.index%setSize)] = disk.path
format, err := getFormatJSON(disk.path) format, err := getFormatJSON(disk.path)
if err != nil { if err != nil {
log.Fatal(err) log.Printf("Unable to read format.json from `%s`, error: %v\n", disk.path, err)
continue
} }
foundDiskLoc, err := getDiskLocation(format) foundDiskLoc, err := getDiskLocation(format)
if err != nil { if err != nil {
log.Fatal(err) log.Printf("Unable to get disk location of `%s`, error: %v\n", disk.path, err)
continue
} }
actualDisksName[foundDiskLoc] = disk.path actualDisksName[foundDiskLoc] = disk.path
} }
uuidMap, err := getDiskUUIDMap() uuidMap, err := getDiskUUIDMap()
if err != nil { if err != nil {
log.Fatal(err) log.Fatal("Unable to analyze UUID in /dev/disk/by-uuid/:", err)
} }
mountMap, err := getMountMap() mountMap, err := getMountMap()
if err != nil { if err != nil {
log.Fatal(err) log.Fatal("Unable to parse /proc/self/mountinfo:", err)
} }
for loc, expectedDiskName := range expectedDisksName { for loc, expectedDiskName := range expectedDisksName {
diskName := actualDisksName[loc] diskName := actualDisksName[loc]
if diskName == "" {
log.Printf("skipping disk location `%s`, err: %v\n", diskName, err)
continue
}
mami, err := getMajorMinor(diskName) mami, err := getMajorMinor(diskName)
if err != nil { if err != nil {
log.Fatal(err) log.Printf("skipping `%s`, err: %v\n", diskName, err)
continue
} }
devName := mountMap[mami] devName := mountMap[mami]
uuid := uuidMap[devName] uuid := uuidMap[devName]
fmt.Printf("UID=%s\t%s\txfs\tdefaults,noatime\t0\t2\n", uuid, expectedDiskName) fmt.Printf("UUID=%s\t%s\txfs\tdefaults,noatime\t0\t2\n", uuid, expectedDiskName)
} }
} }