github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-20 01:29:07 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2743 from dprotaso/master

Browse Source 
After partitioning we now retry the stat prior to formatting
This commit is contained in:
Justin Cormack 2017-11-16 17:21:25 +00:00 committed by GitHub
commit ac55317bde
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pkg/format/format.go
View File

@ -100,13 +100,15 @@ func refreshDevicesAndWaitFor(awaitedDevice string) error {
exec.Command("mdev", "-s").Run() exec.Command("mdev", "-s").Run()
// wait for device // wait for device
var done bool var (
done bool
err error
stat os.FileInfo
)
for i := 0; i < timeout; i++ { for i := 0; i < timeout; i++ {
stat, err := os.Stat(awaitedDevice) stat, err = os.Stat(awaitedDevice)
if err != nil { if err == nil && isBlockDevice(&stat) {
return err
}
if isBlockDevice(&stat) {
done = true done = true
break break
} }
@ -114,7 +116,11 @@ func refreshDevicesAndWaitFor(awaitedDevice string) error {
exec.Command("mdev", "-s").Run() exec.Command("mdev", "-s").Run()
} }
if !done { if !done {
return fmt.Errorf("Error waiting for device %s", awaitedDevice) var statMsg string
if err != nil {
statMsg = fmt.Sprintf(" - stat returned: %v", err)
}
return fmt.Errorf("Failed to find block device %s%s", awaitedDevice, statMsg)
} }
// even after the device appears we still have a race // even after the device appears we still have a race
time.Sleep(1 * time.Second) time.Sleep(1 * time.Second)