Skip to content

Commit 8721418

Browse files
committed
log operation id for attach and detach
1 parent 41bba8a commit 8721418

File tree

1 file changed

+22
-0
lines changed

1 file changed

+22
-0
lines changed

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

+22
Original file line numberDiff line numberDiff line change
@@ -415,12 +415,14 @@ func (cloud *CloudProvider) insertRegionalDisk(
415415
insertOp, err = cloud.betaService.RegionDisks.Insert(project, volKey.Region, betaDiskToCreate).Context(ctx).Do()
416416
if insertOp != nil {
417417
opName = insertOp.Name
418+
klog.V(5).Infof("InsertDisk operation %s for disk %s", opName, betaDiskToCreate.Name)
418419
}
419420
} else {
420421
var insertOp *computev1.Operation
421422
insertOp, err = cloud.service.RegionDisks.Insert(project, volKey.Region, diskToCreate).Context(ctx).Do()
422423
if insertOp != nil {
423424
opName = insertOp.Name
425+
klog.V(5).Infof("InsertDisk operation %s for disk %s", opName, diskToCreate.Name)
424426
}
425427
}
426428
if err != nil {
@@ -509,12 +511,14 @@ func (cloud *CloudProvider) insertZonalDisk(
509511
insertOp, err = cloud.betaService.Disks.Insert(project, volKey.Zone, betaDiskToCreate).Context(ctx).Do()
510512
if insertOp != nil {
511513
opName = insertOp.Name
514+
klog.V(5).Infof("InsertDisk operation %s for disk %s", opName, betaDiskToCreate.Name)
512515
}
513516
} else {
514517
var insertOp *computev1.Operation
515518
insertOp, err = cloud.service.Disks.Insert(project, volKey.Zone, diskToCreate).Context(ctx).Do()
516519
if insertOp != nil {
517520
opName = insertOp.Name
521+
klog.V(5).Infof("InsertDisk operation %s for disk %s", opName, diskToCreate.Name)
518522
}
519523
}
520524

@@ -574,6 +578,9 @@ func (cloud *CloudProvider) DeleteDisk(ctx context.Context, project string, volK
574578

575579
func (cloud *CloudProvider) deleteZonalDisk(ctx context.Context, project, zone, name string) error {
576580
op, err := cloud.service.Disks.Delete(project, zone, name).Context(ctx).Do()
581+
if op != nil {
582+
klog.V(5).Infof("DeleteDisk operation %s for disk %s", op.Name, name)
583+
}
577584
if err != nil {
578585
if IsGCEError(err, "notFound") {
579586
// Already deleted
@@ -590,6 +597,9 @@ func (cloud *CloudProvider) deleteZonalDisk(ctx context.Context, project, zone,
590597

591598
func (cloud *CloudProvider) deleteRegionalDisk(ctx context.Context, project, region, name string) error {
592599
op, err := cloud.service.RegionDisks.Delete(project, region, name).Context(ctx).Do()
600+
if op != nil {
601+
klog.V(5).Infof("DeleteDisk operation %s for disk %s", op.Name, name)
602+
}
593603
if err != nil {
594604
if IsGCEError(err, "notFound") {
595605
// Already deleted
@@ -621,6 +631,9 @@ func (cloud *CloudProvider) AttachDisk(ctx context.Context, project string, volK
621631
}
622632

623633
op, err := cloud.service.Instances.AttachDisk(project, instanceZone, instanceName, attachedDiskV1).Context(ctx).Do()
634+
if op != nil {
635+
klog.V(5).Infof("AttachDisk operation %s for disk %s", op.Name, attachedDiskV1.DeviceName)
636+
}
624637
if err != nil {
625638
return fmt.Errorf("failed cloud service attach disk call: %v", err)
626639
}
@@ -634,6 +647,9 @@ func (cloud *CloudProvider) AttachDisk(ctx context.Context, project string, volK
634647
func (cloud *CloudProvider) DetachDisk(ctx context.Context, project, deviceName, instanceZone, instanceName string) error {
635648
klog.V(5).Infof("Detaching disk %v from %v", deviceName, instanceName)
636649
op, err := cloud.service.Instances.DetachDisk(project, instanceZone, instanceName, deviceName).Context(ctx).Do()
650+
if op != nil {
651+
klog.V(5).Infof("DetachDisk operation %s for disk %s", op.Name, deviceName)
652+
}
637653
if err != nil {
638654
return err
639655
}
@@ -846,6 +862,9 @@ func (cloud *CloudProvider) resizeZonalDisk(ctx context.Context, project string,
846862
SizeGb: requestGb,
847863
}
848864
op, err := cloud.service.Disks.Resize(project, volKey.Zone, volKey.Name, resizeReq).Context(ctx).Do()
865+
if op != nil {
866+
klog.V(5).Infof("ResizeDisk operation %s for disk %s", op.Name, volKey.Name)
867+
}
849868
if err != nil {
850869
return -1, fmt.Errorf("failed to resize zonal volume %v: %v", volKey.String(), err)
851870
}
@@ -864,6 +883,9 @@ func (cloud *CloudProvider) resizeRegionalDisk(ctx context.Context, project stri
864883
}
865884

866885
op, err := cloud.service.RegionDisks.Resize(project, volKey.Region, volKey.Name, resizeReq).Context(ctx).Do()
886+
if op != nil {
887+
klog.V(5).Infof("ResizeDisk operation %s for disk %s", op.Name, volKey.Name)
888+
}
867889
if err != nil {
868890
return -1, fmt.Errorf("failed to resize regional volume %v: %v", volKey.String(), err)
869891
}

0 commit comments

Comments
 (0)