From 199ef0fba9b6b2eb1aff496a0ea2c9a76bbd1a04 Mon Sep 17 00:00:00 2001 From: andyzhangx Date: Tue, 26 Feb 2019 13:37:20 +0000 Subject: [PATCH] add more logging in azure disk attach/detach --- .../providers/azure/azure_controller_standard.go | 14 +++++++------- .../providers/azure/azure_controller_vmss.go | 6 +++--- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pkg/cloudprovider/providers/azure/azure_controller_standard.go b/pkg/cloudprovider/providers/azure/azure_controller_standard.go index 610289e67b..b380996f4e 100644 --- a/pkg/cloudprovider/providers/azure/azure_controller_standard.go +++ b/pkg/cloudprovider/providers/azure/azure_controller_standard.go @@ -74,7 +74,7 @@ func (as *availabilitySet) AttachDisk(isManagedDisk bool, diskName, diskURI stri }, }, } - klog.V(2).Infof("azureDisk - update(%s): vm(%s) - attach disk(%s)", nodeResourceGroup, vmName, diskName) + klog.V(2).Infof("azureDisk - update(%s): vm(%s) - attach disk(%s, %s)", nodeResourceGroup, vmName, diskName, diskURI) ctx, cancel := getContextWithCancel() defer cancel() @@ -83,15 +83,15 @@ func (as *availabilitySet) AttachDisk(isManagedDisk bool, diskName, diskURI stri _, err = as.VirtualMachinesClient.CreateOrUpdate(ctx, nodeResourceGroup, vmName, newVM) if err != nil { - klog.Errorf("azureDisk - attach disk(%s) failed, err: %v", diskName, err) + klog.Errorf("azureDisk - attach disk(%s, %s) failed, err: %v", diskName, diskURI, err) detail := err.Error() if strings.Contains(detail, errLeaseFailed) || strings.Contains(detail, errDiskBlobNotFound) { // if lease cannot be acquired or disk not found, immediately detach the disk and return the original error - klog.V(2).Infof("azureDisk - err %v, try detach disk(%s)", err, diskName) + klog.V(2).Infof("azureDisk - err %v, try detach disk(%s, %s)", err, diskName, diskURI) as.DetachDiskByName(diskName, diskURI, nodeName) } } else { - klog.V(2).Infof("azureDisk - attach disk(%s) succeeded", diskName) + klog.V(2).Infof("azureDisk - attach disk(%s, %s) succeeded", diskName, diskURI) } return err } @@ -102,7 +102,7 @@ func (as *availabilitySet) DetachDiskByName(diskName, diskURI string, nodeName t vm, err := as.getVirtualMachine(nodeName) if err != nil { // if host doesn't exist, no need to detach - klog.Warningf("azureDisk - cannot find node %s, skip detaching disk %s", nodeName, diskName) + klog.Warningf("azureDisk - cannot find node %s, skip detaching disk(%s, %s)", nodeName, diskName, diskURI) return nil } @@ -139,7 +139,7 @@ func (as *availabilitySet) DetachDiskByName(diskName, diskURI string, nodeName t }, }, } - klog.V(2).Infof("azureDisk - update(%s): vm(%s) - detach disk(%s)", nodeResourceGroup, vmName, diskName) + klog.V(2).Infof("azureDisk - update(%s): vm(%s) - detach disk(%s, %s)", nodeResourceGroup, vmName, diskName, diskURI) ctx, cancel := getContextWithCancel() defer cancel() @@ -156,7 +156,7 @@ func (as *availabilitySet) DetachDiskByName(diskName, diskURI string, nodeName t } } if err != nil { - klog.Errorf("azureDisk - detach disk(%s, %s)) failed, err: %v", diskName, diskURI, err) + klog.Errorf("azureDisk - detach disk(%s, %s) failed, err: %v", diskName, diskURI, err) } else { klog.V(2).Infof("azureDisk - detach disk(%s, %s) succeeded", diskName, diskURI) } diff --git a/pkg/cloudprovider/providers/azure/azure_controller_vmss.go b/pkg/cloudprovider/providers/azure/azure_controller_vmss.go index 43f49aaeec..442dd8fedc 100644 --- a/pkg/cloudprovider/providers/azure/azure_controller_vmss.go +++ b/pkg/cloudprovider/providers/azure/azure_controller_vmss.go @@ -86,17 +86,17 @@ func (ss *scaleSet) AttachDisk(isManagedDisk bool, diskName, diskURI string, nod key := buildVmssCacheKey(nodeResourceGroup, ss.makeVmssVMName(ssName, instanceID)) defer ss.vmssVMCache.Delete(key) - klog.V(2).Infof("azureDisk - update(%s): vm(%s) - attach disk(%s)", nodeResourceGroup, nodeName, diskName) + klog.V(2).Infof("azureDisk - update(%s): vm(%s) - attach disk(%s, %s)", nodeResourceGroup, nodeName, diskName, diskURI) _, err = ss.VirtualMachineScaleSetVMsClient.Update(ctx, nodeResourceGroup, ssName, instanceID, newVM) if err != nil { detail := err.Error() if strings.Contains(detail, errLeaseFailed) || strings.Contains(detail, errDiskBlobNotFound) { // if lease cannot be acquired or disk not found, immediately detach the disk and return the original error - klog.Infof("azureDisk - err %s, try detach disk(%s)", detail, diskName) + klog.Infof("azureDisk - err %s, try detach disk(%s, %s)", detail, diskName, diskURI) ss.DetachDiskByName(diskName, diskURI, nodeName) } } else { - klog.V(2).Infof("azureDisk - attach disk(%s) succeeded", diskName) + klog.V(2).Infof("azureDisk - attach disk(%s, %s) succeeded", diskName, diskURI) } return err }