Skip to content

Commit 830e730

Browse files
andyzhangxk8s-infra-cherrypick-robot
authored andcommitted
fix: refine create volume metrics
1 parent 86f0e68 commit 830e730

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

pkg/blob/controllerserver.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -312,6 +312,13 @@ func (d *Driver) CreateVolume(ctx context.Context, req *csi.CreateVolumeRequest)
312312
GetLatestAccountKey: getLatestAccountKey,
313313
}
314314

315+
var volumeID string
316+
mc := metrics.NewMetricContext(blobCSIDriverName, "controller_create_volume", d.cloud.ResourceGroup, d.cloud.SubscriptionID, d.Name)
317+
isOperationSucceeded := false
318+
defer func() {
319+
mc.ObserveOperationWithResult(isOperationSucceeded, VolumeID, volumeID)
320+
}()
321+
315322
var accountKey string
316323
accountName := account
317324
secrets := req.GetSecrets()
@@ -380,13 +387,6 @@ func (d *Driver) CreateVolume(ctx context.Context, req *csi.CreateVolumeRequest)
380387
setKeyValueInMap(parameters, containerNameField, validContainerName)
381388
}
382389

383-
var volumeID string
384-
mc := metrics.NewMetricContext(blobCSIDriverName, "controller_create_volume", d.cloud.ResourceGroup, d.cloud.SubscriptionID, d.Name)
385-
isOperationSucceeded := false
386-
defer func() {
387-
mc.ObserveOperationWithResult(isOperationSucceeded, VolumeID, volumeID)
388-
}()
389-
390390
klog.V(2).Infof("begin to create container(%s) on account(%s) type(%s) subsID(%s) rg(%s) location(%s) size(%d)", validContainerName, accountName, storageAccountType, subsID, resourceGroup, location, requestGiB)
391391
if err := d.CreateBlobContainer(ctx, subsID, resourceGroup, accountName, validContainerName, secrets); err != nil {
392392
return nil, status.Errorf(codes.Internal, "failed to create container(%s) on account(%s) type(%s) rg(%s) location(%s) size(%d), error: %v", validContainerName, accountName, storageAccountType, resourceGroup, location, requestGiB, err)

0 commit comments

Comments
 (0)