daniel
/
distribution
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #950 from jackpgriffin/master 

Skip creating swift container if already exists
master
Richard Scothern 2015-10-01 10:15:54 -07:00
parent 618ffe118b 2749bcdc28
commit 61a4a1362c
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
registry/storage/driver/swift/swift.go
View File

@ -167,8 +167,12 @@ func New(params Parameters) (*Driver, error) {
return nil, fmt.Errorf("Swift authentication failed: %s", err) return nil, fmt.Errorf("Swift authentication failed: %s", err)
} }
if err := ct.ContainerCreate(params.Container, nil); err != nil { if _, _, err := ct.Container(params.Container); err == swift.ContainerNotFound {
return nil, fmt.Errorf("Failed to create container %s (%s)", params.Container, err) if err := ct.ContainerCreate(params.Container, nil); err != nil {
return nil, fmt.Errorf("Failed to create container %s (%s)", params.Container, err)
}
} else if err != nil {
return nil, fmt.Errorf("Failed to retrieve info about container %s (%s)", params.Container, err)
} }
d := &driver{ d := &driver{