github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-04 18:00:08 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #22622 from Kaffa-MY/k8s-flocker

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2016-03-07 05:43:39 -08:00
commit 6669e43f1c
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/volume/flocker/plugin.go
View File

@ -199,9 +199,15 @@ func (b flockerBuilder) SetUpAt(dir string, fsGroup *int64) error {
if err := b.updateDatasetPrimary(datasetID, primaryUUID); err != nil { if err := b.updateDatasetPrimary(datasetID, primaryUUID); err != nil {
return err return err
} }
newState, err := b.client.GetDatasetState(datasetID)
if err != nil {
return fmt.Errorf("The volume '%s' migrated unsuccessfully.", datasetID)
}
b.flocker.path = newState.Path
} else {
b.flocker.path = s.Path
} }
b.flocker.path = s.Path
volumeutil.SetReady(b.getMetaDir()) volumeutil.SetReady(b.getMetaDir())
return nil return nil
} }