github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #42317 from NickrenREN/attach-detach-error-info-print 

Automatic merge from submit-queue

add and clear err message about RemoveVolumeFromReportAsAttached()

**Release note**:

```release-note
NONE
```
pull/6/head
Kubernetes Submit Queue 2017-05-09 10:44:32 -07:00 committed by GitHub
parent 97889d4ff9 0861688237
commit 202a9f8445
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/controller/volume/attachdetach/cache/actual_state_of_world.go vendored
View File

@ -424,7 +424,7 @@ func (asw *actualStateOfWorld) removeVolumeFromReportAsAttached(
return nil
}
}
return fmt.Errorf("volume %q or node %q does not exist in volumesToReportAsAttached list",
return fmt.Errorf("volume %q does not exist in volumesToReportAsAttached list or node %q does not exist in nodesToUpdateStatusFor list",
volumeName,
nodeName)

8
pkg/controller/volume/attachdetach/reconciler/reconciler.go
View File

@ -150,7 +150,13 @@ func (rc *reconciler) reconcile() {
// Before triggering volume detach, mark volume as detached and update the node status
// If it fails to update node status, skip detach volume
rc.actualStateOfWorld.RemoveVolumeFromReportAsAttached(attachedVolume.VolumeName, attachedVolume.NodeName)
err = rc.actualStateOfWorld.RemoveVolumeFromReportAsAttached(attachedVolume.VolumeName, attachedVolume.NodeName)
if err != nil {
glog.V(5).Infof("RemoveVolumeFromReportAsAttached failed while removing volume %q from node %q with: %v",
attachedVolume.VolumeName,
attachedVolume.NodeName,
err)
}
// Update Node Status to indicate volume is no longer safe to mount.
err = rc.nodeStatusUpdater.UpdateNodeStatuses()