- fixed the defencing of the rbd lock

This commit is contained in:
Rohith
2015-08-10 23:33:25 +01:00
parent 5836d455b8
commit bb31cd29ea
2 changed files with 18 additions and 13 deletions

View File

@@ -148,13 +148,18 @@ func (plugin *rbdPlugin) NewCleaner(volName string, podUID types.UID, mounter mo
}
func (plugin *rbdPlugin) newCleanerInternal(volName string, podUID types.UID, manager diskManager, mounter mount.Interface) (volume.Cleaner, error) {
return &rbdCleaner{&rbd{
podUID: podUID,
volName: volName,
manager: manager,
mounter: mounter,
plugin: plugin,
}}, nil
return &rbdCleaner{
rbdBuilder: &rbdBuilder{
rbd: &rbd{
podUID: podUID,
volName: volName,
manager: manager,
mounter: mounter,
plugin: plugin,
},
Mon: make([]string, 0),
},
}, nil
}
type rbd struct {
@@ -211,7 +216,7 @@ func (b *rbdBuilder) SetUpAt(dir string) error {
}
type rbdCleaner struct {
*rbd
*rbdBuilder
}
var _ volume.Cleaner = &rbdCleaner{}