Skip to content

Commit 775e0af

Browse files
authored
Merge pull request #871 from amacaskill/operation-id
Log operation id for attach and detach
2 parents f370da1 + 84b5292 commit 775e0af

File tree

1 file changed

+12
-0
lines changed

1 file changed

+12
-0
lines changed

pkg/gce-cloud-provider/compute/gce-compute.go

+12
Original file line numberDiff line numberDiff line change
@@ -445,6 +445,7 @@ func (cloud *CloudProvider) insertRegionalDisk(
445445
}
446446
return status.Error(codes.Internal, fmt.Sprintf("unknown Insert disk error: %v", err))
447447
}
448+
klog.V(5).Infof("InsertDisk operation %s for disk %s", opName, diskToCreate.Name)
448449

449450
err = cloud.waitForRegionalOp(ctx, project, opName, volKey.Region)
450451
if err != nil {
@@ -544,6 +545,7 @@ func (cloud *CloudProvider) insertZonalDisk(
544545
}
545546
return fmt.Errorf("unknown Insert disk error: %v", err)
546547
}
548+
klog.V(5).Infof("InsertDisk operation %s for disk %s", opName, diskToCreate.Name)
547549

548550
err = cloud.waitForZonalOp(ctx, project, opName, volKey.Zone)
549551

@@ -589,6 +591,8 @@ func (cloud *CloudProvider) deleteZonalDisk(ctx context.Context, project, zone,
589591
}
590592
return err
591593
}
594+
klog.V(5).Infof("DeleteDisk operation %s for disk %s", op.Name, name)
595+
592596
err = cloud.waitForZonalOp(ctx, project, op.Name, zone)
593597
if err != nil {
594598
return err
@@ -605,6 +609,8 @@ func (cloud *CloudProvider) deleteRegionalDisk(ctx context.Context, project, reg
605609
}
606610
return err
607611
}
612+
klog.V(5).Infof("DeleteDisk operation %s for disk %s", op.Name, name)
613+
608614
err = cloud.waitForRegionalOp(ctx, project, op.Name, region)
609615
if err != nil {
610616
return err
@@ -632,6 +638,8 @@ func (cloud *CloudProvider) AttachDisk(ctx context.Context, project string, volK
632638
if err != nil {
633639
return fmt.Errorf("failed cloud service attach disk call: %v", err)
634640
}
641+
klog.V(5).Infof("AttachDisk operation %s for disk %s", op.Name, attachedDiskV1.DeviceName)
642+
635643
err = cloud.waitForZonalOp(ctx, project, op.Name, instanceZone)
636644
if err != nil {
637645
return fmt.Errorf("failed when waiting for zonal op: %v", err)
@@ -645,6 +653,8 @@ func (cloud *CloudProvider) DetachDisk(ctx context.Context, project, deviceName,
645653
if err != nil {
646654
return err
647655
}
656+
klog.V(5).Infof("DetachDisk operation %s for disk %s", op.Name, deviceName)
657+
648658
err = cloud.waitForZonalOp(ctx, project, op.Name, instanceZone)
649659
if err != nil {
650660
return err
@@ -857,6 +867,7 @@ func (cloud *CloudProvider) resizeZonalDisk(ctx context.Context, project string,
857867
if err != nil {
858868
return -1, fmt.Errorf("failed to resize zonal volume %v: %v", volKey.String(), err)
859869
}
870+
klog.V(5).Infof("ResizeDisk operation %s for disk %s", op.Name, volKey.Name)
860871

861872
err = cloud.waitForZonalOp(ctx, project, op.Name, volKey.Zone)
862873
if err != nil {
@@ -875,6 +886,7 @@ func (cloud *CloudProvider) resizeRegionalDisk(ctx context.Context, project stri
875886
if err != nil {
876887
return -1, fmt.Errorf("failed to resize regional volume %v: %v", volKey.String(), err)
877888
}
889+
klog.V(5).Infof("ResizeDisk operation %s for disk %s", op.Name, volKey.Name)
878890

879891
err = cloud.waitForRegionalOp(ctx, project, op.Name, volKey.Region)
880892
if err != nil {

0 commit comments

Comments
 (0)