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

Healing process should not heal root disk #7089

Merged
merged 1 commit into from Jan 23, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
20 changes: 13 additions & 7 deletions cmd/posix.go
Expand Up @@ -303,9 +303,10 @@ func (s *posix) IsOnline() bool {
// DiskInfo is an extended type which returns current
// disk usage per path.
type DiskInfo struct {
Total uint64
Free uint64
Used uint64
Total uint64
Free uint64
Used uint64
RootDisk bool
}

// DiskInfo provides current information about disk space usage,
Expand All @@ -319,12 +320,17 @@ func (s *posix) DiskInfo() (info DiskInfo, err error) {
if !s.diskMount {
used = atomic.LoadUint64(&s.totalUsed)
}

rootDisk, err := disk.IsRootDisk(s.diskPath)
if err != nil {
return info, err
}
return DiskInfo{
Total: di.Total,
Free: di.Free,
Used: used,
Total: di.Total,
Free: di.Free,
Used: used,
RootDisk: rootDisk,
}, nil

}

// getVolDir - will convert incoming volume names to
Expand Down
12 changes: 12 additions & 0 deletions cmd/xl-sets.go
Expand Up @@ -1029,6 +1029,18 @@ func (s *xlSets) HealFormat(ctx context.Context, dryRun bool) (res madmin.HealRe
}
}(storageDisks)

for i, disk := range storageDisks {
info, err := disk.DiskInfo()
if err != nil {
storageDisks[i] = nil
}
if info.RootDisk {
// We should not heal on root disk. i.e in a situation where the minio-administrator has unmounted a
// defective drive we should not heal a path on the root disk.
storageDisks[i] = nil
}
}

formats, sErrs := loadFormatXLAll(storageDisks)
if err = checkFormatXLValues(formats); err != nil {
return madmin.HealResultItem{}, err
Expand Down
31 changes: 31 additions & 0 deletions pkg/disk/root-disk-unix.go
@@ -0,0 +1,31 @@
// +build !windows

package disk

import (
"os"
"syscall"
)

// IsRootDisk returns if diskPath belongs to root-disk, i.e the disk mounted at "/"
func IsRootDisk(diskPath string) (bool, error) {
rootDisk := false
diskInfo, err := os.Stat(diskPath)
if err != nil {
return false, err
}
rootInfo, err := os.Stat("/")
if err != nil {
return false, err
}
diskStat, diskStatOK := diskInfo.Sys().(*syscall.Stat_t)
rootStat, rootStatOK := rootInfo.Sys().(*syscall.Stat_t)
if diskStatOK && rootStatOK {
if diskStat.Dev == rootStat.Dev {
// Indicate if the disk path is on root disk. This is used to indicate the healing
// process not to format the drive and end up healing it.
rootDisk = true
}
}
return rootDisk, nil
}
9 changes: 9 additions & 0 deletions pkg/disk/root-disk-windows.go
@@ -0,0 +1,9 @@
// +build windows

package disk

// IsRootDisk returns if diskPath belongs to root-disk, i.e the disk mounted at "/"
func IsRootDisk(diskPath string) (bool, error) {
// On windows a disk can never be mounted on a subpath.
return false, nil
}