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

Fix vmss listing for Azure cloud provider

Browse Source
This commit is contained in:
Pengfei Ni 2017-12-29 10:50:57 +08:00
parent a6510faf1d
commit 6dd9cc6dbf
1 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
pkg/cloudprovider/providers/azure/azure_util_vmss.go
View File

@ -164,20 +164,20 @@ func (ss *scaleSet) getCachedVirtualMachine(nodeName string) (scaleSetVMInfo, er
ss.cacheMutex.Lock() ss.cacheMutex.Lock()
defer ss.cacheMutex.Unlock() defer ss.cacheMutex.Unlock()
getVMFromCache := func(nodeName string) (scaleSetVMInfo, error) { getVMFromCache := func(nodeName string) (scaleSetVMInfo, bool) {
for scaleSetName := range ss.cache { for scaleSetName := range ss.cache {
for _, vm := range ss.cache[scaleSetName] { for _, vm := range ss.cache[scaleSetName] {
if vm.NodeName == nodeName { if vm.NodeName == nodeName {
return vm, nil return vm, true
} }
} }
} }
return scaleSetVMInfo{}, cloudprovider.InstanceNotFound return scaleSetVMInfo{}, false
} }
vm, err := getVMFromCache(nodeName) vm, found := getVMFromCache(nodeName)
if err == nil { if found {
return vm, nil return vm, nil
} }
@ -187,11 +187,11 @@ func (ss *scaleSet) getCachedVirtualMachine(nodeName string) (scaleSetVMInfo, er
} }
// Update cache and try again. // Update cache and try again.
if err = ss.updateCache(); err != nil { if err := ss.updateCache(); err != nil {
return scaleSetVMInfo{}, err return scaleSetVMInfo{}, err
} }
vm, err = getVMFromCache(nodeName) vm, found = getVMFromCache(nodeName)
if err == nil { if found {
return vm, nil return vm, nil
} }
@ -204,35 +204,35 @@ func (ss *scaleSet) getCachedVirtualMachineByInstanceID(scaleSetName, instanceID
ss.cacheMutex.Lock() ss.cacheMutex.Lock()
defer ss.cacheMutex.Unlock() defer ss.cacheMutex.Unlock()
getVMByID := func(scaleSetName, instanceID string) (scaleSetVMInfo, error) { getVMByID := func(scaleSetName, instanceID string) (scaleSetVMInfo, bool) {
vms, ok := ss.cache[scaleSetName] vms, ok := ss.cache[scaleSetName]
if !ok { if !ok {
glog.V(4).Infof("scale set (%s) not found", scaleSetName) glog.V(4).Infof("scale set (%s) not found", scaleSetName)
return scaleSetVMInfo{}, cloudprovider.InstanceNotFound return scaleSetVMInfo{}, false
} }
for _, vm := range vms { for _, vm := range vms {
if vm.InstanceID == instanceID { if vm.InstanceID == instanceID {
glog.V(4).Infof("getCachedVirtualMachineByInstanceID gets vm (%s) by instanceID (%s) within scale set (%s)", vm.NodeName, instanceID, scaleSetName) glog.V(4).Infof("getCachedVirtualMachineByInstanceID gets vm (%s) by instanceID (%s) within scale set (%s)", vm.NodeName, instanceID, scaleSetName)
return vm, nil return vm, true
} }
} }
glog.V(4).Infof("instanceID (%s) not found in scale set (%s)", instanceID, scaleSetName) glog.V(4).Infof("instanceID (%s) not found in scale set (%s)", instanceID, scaleSetName)
return scaleSetVMInfo{}, cloudprovider.InstanceNotFound return scaleSetVMInfo{}, false
} }
vm, err := getVMByID(scaleSetName, instanceID) vm, found := getVMByID(scaleSetName, instanceID)
if err == nil { if found {
return vm, nil return vm, nil
} }
// Update cache and try again. // Update cache and try again.
if err = ss.updateCache(); err != nil { if err := ss.updateCache(); err != nil {
return scaleSetVMInfo{}, err return scaleSetVMInfo{}, err
} }
vm, err = getVMByID(scaleSetName, instanceID) vm, found = getVMByID(scaleSetName, instanceID)
if err == nil { if found {
return vm, nil return vm, nil
} }
@ -407,7 +407,7 @@ func (ss *scaleSet) listScaleSetsWithRetry() ([]string, error) {
return nil, backoffError return nil, backoffError
} }
appendResults := (result.Value != nil && len(*result.Value) > 1) appendResults := (result.Value != nil && len(*result.Value) > 0)
for appendResults { for appendResults {
for _, scaleSet := range *result.Value { for _, scaleSet := range *result.Value {
allScaleSets = append(allScaleSets, *scaleSet.Name) allScaleSets = append(allScaleSets, *scaleSet.Name)
@ -431,7 +431,7 @@ func (ss *scaleSet) listScaleSetsWithRetry() ([]string, error) {
return nil, backoffError return nil, backoffError
} }
appendResults = (result.Value != nil && len(*result.Value) > 1) appendResults = (result.Value != nil && len(*result.Value) > 0)
} }
} }
@ -461,7 +461,7 @@ func (ss *scaleSet) listScaleSetVMsWithRetry(scaleSetName string) ([]compute.Vir
return nil, backoffError return nil, backoffError
} }
appendResults := (result.Value != nil && len(*result.Value) > 1) appendResults := (result.Value != nil && len(*result.Value) > 0)
for appendResults { for appendResults {
allVMs = append(allVMs, *result.Value...) allVMs = append(allVMs, *result.Value...)
appendResults = false appendResults = false
@ -483,7 +483,7 @@ func (ss *scaleSet) listScaleSetVMsWithRetry(scaleSetName string) ([]compute.Vir
return nil, backoffError return nil, backoffError
} }
appendResults = (result.Value != nil && len(*result.Value) > 1) appendResults = (result.Value != nil && len(*result.Value) > 0)
} }
} }