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

Merge pull request #70548 from vladimirvivien/csi-plugin-deregister

Browse Source 
CSI Kubelet Plugin Watcher DeRegistration
This commit is contained in:
k8s-ci-robot 2018-11-02 08:39:06 -07:00 committed by GitHub
commit 6c0684f010
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
pkg/volume/csi/csi_plugin.go
View File

@ -138,23 +138,34 @@ func (h *RegistrationHandler) RegisterPlugin(pluginName string, endpoint string)
driverNodeID, maxVolumePerNode, accessibleTopology, err := csi.NodeGetInfo(ctx) driverNodeID, maxVolumePerNode, accessibleTopology, err := csi.NodeGetInfo(ctx)
if err != nil { if err != nil {
unregisterDriver(pluginName) glog.Error(log("registrationHandler.RegisterPlugin failed at CSI.NodeGetInfo: %v", err))
return fmt.Errorf("error during CSI NodeGetInfo() call: %v", err) if unregErr := unregisterDriver(pluginName); unregErr != nil {
glog.Error(log("registrationHandler.RegisterPlugin failed to unregister plugin due to previous: %v", unregErr))
return unregErr
}
return err
} }
err = nim.AddNodeInfo(pluginName, driverNodeID, maxVolumePerNode, accessibleTopology) err = nim.AddNodeInfo(pluginName, driverNodeID, maxVolumePerNode, accessibleTopology)
if err != nil { if err != nil {
unregisterDriver(pluginName) glog.Error(log("registrationHandler.RegisterPlugin failed at AddNodeInfo: %v", err))
return fmt.Errorf("error updating CSI node info in the cluster: %v", err) if unregErr := unregisterDriver(pluginName); unregErr != nil {
glog.Error(log("registrationHandler.RegisterPlugin failed to unregister plugin due to previous error: %v", unregErr))
return unregErr
}
return err
} }
return nil return nil
} }
// DeRegisterPlugin is called when a plugin removed it's socket, signaling // DeRegisterPlugin is called when a plugin removed its socket, signaling
// it is no longer available // it is no longer available
// TODO: Handle DeRegistration
func (h *RegistrationHandler) DeRegisterPlugin(pluginName string) { func (h *RegistrationHandler) DeRegisterPlugin(pluginName string) {
glog.V(4).Info(log("registrationHandler.DeRegisterPlugin request for plugin %s", pluginName))
if err := unregisterDriver(pluginName); err != nil {
glog.Error(log("registrationHandler.DeRegisterPlugin failed: %v", err))
}
} }
func (p *csiPlugin) Init(host volume.VolumeHost) error { func (p *csiPlugin) Init(host volume.VolumeHost) error {
@ -565,7 +576,7 @@ func (p *csiPlugin) getPublishVolumeInfo(client clientset.Interface, handle, dri
return attachment.Status.AttachmentMetadata, nil return attachment.Status.AttachmentMetadata, nil
} }
func unregisterDriver(driverName string) { func unregisterDriver(driverName string) error {
func() { func() {
csiDrivers.Lock() csiDrivers.Lock()
defer csiDrivers.Unlock() defer csiDrivers.Unlock()
@ -574,5 +585,8 @@ func unregisterDriver(driverName string) {
if err := nim.RemoveNodeInfo(driverName); err != nil { if err := nim.RemoveNodeInfo(driverName); err != nil {
glog.Errorf("Error unregistering CSI driver: %v", err) glog.Errorf("Error unregistering CSI driver: %v", err)
return err
} }
return nil
} }