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

Merge pull request #47406 from justinsb/fix_47404

Browse Source 
Automatic merge from submit-queue

AWS: Process disk attachments even with duplicate NodeNames

Fix #47404


```release-note
AWS: Process disk attachments even with duplicate NodeNames
```
This commit is contained in:
Kubernetes Submit Queue 2017-06-14 10:21:20 -07:00 committed by GitHub
commit 6c38d009ce
1 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
pkg/cloudprovider/providers/aws/aws.go
View File

@ -1902,15 +1902,17 @@ func (c *Cloud) DisksAreAttached(nodeDisks map[types.NodeName][]KubernetesVolume
return attached, nil return attached, nil
} }
dnsNameSlice := []string{} nodeNames := []string{}
for nodeName, diskNames := range nodeDisks { for nodeName, diskNames := range nodeDisks {
for _, diskName := range diskNames { for _, diskName := range diskNames {
setNodeDisk(attached, diskName, nodeName, false) setNodeDisk(attached, diskName, nodeName, false)
} }
dnsNameSlice = append(dnsNameSlice, mapNodeNameToPrivateDNSName(nodeName)) nodeNames = append(nodeNames, mapNodeNameToPrivateDNSName(nodeName))
} }
awsInstances, err := c.getInstancesByNodeNames(dnsNameSlice) // Note that we get instances regardless of state.
// This means there might be multiple nodes with the same node names.
awsInstances, err := c.getInstancesByNodeNames(nodeNames)
if err != nil { if err != nil {
// When there is an error fetching instance information // When there is an error fetching instance information
// it is safer to return nil and let volume information not be touched. // it is safer to return nil and let volume information not be touched.
@ -1918,24 +1920,26 @@ func (c *Cloud) DisksAreAttached(nodeDisks map[types.NodeName][]KubernetesVolume
} }
if len(awsInstances) == 0 { if len(awsInstances) == 0 {
glog.V(2).Infof("DisksAreAttached will assume no disks are attached to any node on AWS cluster.") glog.V(2).Infof("DisksAreAttached found no instances matching node names; will assume disks not attached")
return attached, nil return attached, nil
} }
awsInstanceMap := make(map[types.NodeName]*ec2.Instance)
for _, awsInstance := range awsInstances {
awsInstanceMap[mapInstanceToNodeName(awsInstance)] = awsInstance
}
// Note that we check that the volume is attached to the correct node, not that it is attached to _a_ node // Note that we check that the volume is attached to the correct node, not that it is attached to _a_ node
for nodeName, diskNames := range nodeDisks { for _, awsInstance := range awsInstances {
awsInstance := awsInstanceMap[nodeName] nodeName := mapInstanceToNodeName(awsInstance)
if awsInstance == nil {
// If instance no longer exists, safe to assume volume is not attached. diskNames := nodeDisks[nodeName]
glog.Warningf( if len(diskNames) == 0 {
"Node %q does not exist. DisksAreAttached will assume disks %v are not attached to it.", continue
nodeName, }
diskNames)
awsInstanceState := "<nil>"
if awsInstance != nil && awsInstance.State != nil {
awsInstanceState = aws.StringValue(awsInstance.State.Name)
}
if awsInstanceState == "terminated" {
// Instance is terminated, safe to assume volumes not attached
// Note that we keep volumes attached to instances in other states (most notably, stopped)
continue continue
} }