github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-24 12:15:52 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #85158 from andyzhangx/vmss-dirty-cache

Browse Source 
fix vmss dirty cache issue
This commit is contained in:
Kubernetes Prow Robot 2019-11-13 13:04:49 -08:00 committed by GitHub
commit 1057f3a82a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
staging/src/k8s.io/legacy-cloud-providers/azure/azure_controller_vmss.go
View File

@ -88,9 +88,7 @@ func (ss *scaleSet) AttachDisk(isManagedDisk bool, diskName, diskURI string, nod
defer cancel()
// Invalidate the cache right after updating
if err = ss.deleteCacheForNode(vmName); err != nil {
return err
}
defer ss.deleteCacheForNode(vmName)
klog.V(2).Infof("azureDisk - update(%s): vm(%s) - attach disk(%s, %s) with DiskEncryptionSetID(%s)", nodeResourceGroup, nodeName, diskName, diskURI, diskEncryptionSetID)
_, err = ss.VirtualMachineScaleSetVMsClient.Update(ctx, nodeResourceGroup, ssName, instanceID, newVM, "attach_disk")
@ -160,9 +158,7 @@ func (ss *scaleSet) DetachDisk(diskName, diskURI string, nodeName types.NodeName
defer cancel()
// Invalidate the cache right after updating
if err = ss.deleteCacheForNode(vmName); err != nil {
return nil, err
}
defer ss.deleteCacheForNode(vmName)
klog.V(2).Infof("azureDisk - update(%s): vm(%s) - detach disk(%s, %s)", nodeResourceGroup, nodeName, diskName, diskURI)
return ss.VirtualMachineScaleSetVMsClient.Update(ctx, nodeResourceGroup, ssName, instanceID, newVM, "detach_disk")

12
staging/src/k8s.io/legacy-cloud-providers/azure/azure_vmss.go
View File

@ -850,10 +850,8 @@ func (ss *scaleSet) EnsureHostInPool(service *v1.Service, nodeName types.NodeNam
return err
}
// Invalidate the cache since we would update it.
if err = ss.deleteCacheForNode(vmName); err != nil {
return err
}
// Invalidate the cache since right after update
defer ss.deleteCacheForNode(vmName)
// Update vmssVM with backoff.
ctx, cancel := getContextWithCancel()
@ -1129,10 +1127,8 @@ func (ss *scaleSet) ensureBackendPoolDeletedFromNode(service *v1.Service, nodeNa
return err
}
// Invalidate the cache since we would update it.
if err = ss.deleteCacheForNode(nodeName); err != nil {
return err
}
// Invalidate the cache since right after update
defer ss.deleteCacheForNode(nodeName)
// Update vmssVM with backoff.
ctx, cancel := getContextWithCancel()

1
staging/src/k8s.io/legacy-cloud-providers/azure/azure_vmss_cache.go
View File

@ -117,6 +117,7 @@ func (ss *scaleSet) newVMSSVirtualMachinesCache() (*timedCache, error) {
func (ss *scaleSet) deleteCacheForNode(nodeName string) error {
cached, err := ss.vmssVMCache.Get(vmssVirtualMachinesKey, cacheReadTypeUnsafe)
if err != nil {
klog.Errorf("deleteCacheForNode(%s) failed with error: %v", nodeName, err)
return err
}