Merge pull request #50239 from FengyunPan/fix-no-exist-node

Automatic merge from submit-queue (batch tested with PRs 38947, 50239, 51115, 51094, 51116) Mark the volumes as detached when node does not exist If node does not exist, node's volumes will be detached automatically and become available. So mark them detached and do not return err. **Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes # #50200 **Release note**: ```release-note NONE ```

Merge pull request #50239 from FengyunPan/fix-no-exist-node
012e94b6 · Kubernetes Submit Queue · GitHub · 7df5c632 · 63725e3e · 012e94b6
Commit 012e94b6 authored Aug 23, 2017 by Kubernetes Submit Queue Committed by GitHub Aug 23, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 15 additions and 0 deletions

openstack_instances.go pkg/cloudprovider/providers/openstack/openstack_instances.go +3 -0

attacher.go pkg/volume/cinder/attacher.go +12 -0

No files found.
--- a/pkg/cloudprovider/providers/openstack/openstack_instances.go
+++ b/pkg/cloudprovider/providers/openstack/openstack_instances.go
@@ -126,6 +126,9 @@ func (os *OpenStack) InstanceID() (string, error) {
 func (i *Instances) InstanceID(name types.NodeName) (string, error) {
 	srv, err := getServerByName(i.compute, name)
 	if err != nil {
+		if err == ErrNotFound {
+			return "", cloudprovider.InstanceNotFound
+		}
 		return "", err
 	}
 	// In the future it is possible to also return an endpoint as:

--- a/pkg/volume/cinder/attacher.go
+++ b/pkg/volume/cinder/attacher.go
@@ -26,6 +26,7 @@ import (
 	"github.com/golang/glog"
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/apimachinery/pkg/util/wait"
+	"k8s.io/kubernetes/pkg/cloudprovider"
 	"k8s.io/kubernetes/pkg/util/mount"
 	"k8s.io/kubernetes/pkg/volume"
 	volumeutil "k8s.io/kubernetes/pkg/volume/util"
@@ -186,6 +187,17 @@ func (attacher *cinderDiskAttacher) VolumesAreAttached(specs []*volume.Spec, nod
 	instanceID, err := attacher.nodeInstanceID(nodeName)
 	if err != nil {
+		if err == cloudprovider.InstanceNotFound {
+			// If node doesn't exist, OpenStack Nova will assume the volumes are not attached to it.
+			// Mark the volumes as detached and return false without error.
+			glog.Warningf("VolumesAreAttached: node %q does not exist.", nodeName)
+			for spec := range volumesAttachedCheck {
+				volumesAttachedCheck[spec] = false
+			}
+			return volumesAttachedCheck, nil
+		}
 		return volumesAttachedCheck, err
 	}