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

Jump to bottom

Check presence of /dev/disk/by-id before reading it in ScaleIO #66174

Merged
merged 1 commit into from Jul 18, 2018
Merged

Check presence of /dev/disk/by-id before reading it in ScaleIO #66174

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 7 additions & 3 deletions pkg/volume/scaleio/sio_client.go
View file
Open in desktop
Expand Up @@ -339,10 +339,14 @@ func (c *sioClient) getGuid() (string, error) {
func (c *sioClient) getSioDiskPaths() ([]os.FileInfo, error) {
files, err := ioutil.ReadDir(sioDiskIDPath)
if err != nil {
glog.Error(log("failed to ReadDir %s: %v", sioDiskIDPath, err))
return nil, err
if os.IsNotExist(err) {
// sioDiskIDPath may not exist yet which is fine
return []os.FileInfo{}, nil
} else {
glog.Error(log("failed to ReadDir %s: %v", sioDiskIDPath, err))
return nil, err
}
}

result := []os.FileInfo{}
for _, file := range files {
if c.diskRegex.MatchString(file.Name()) {
Expand Down