Skip to content

Commit

Permalink
Merge pull request #2229 from k8s-infra-cherrypick-robot/cherry-pick-…
Browse files Browse the repository at this point in the history
…2226-to-release-1.29

[release-1.29] fix: ignore ShareAlreadyExists error in snapshot restore and clone
  • Loading branch information
andyzhangx authored Nov 30, 2024
2 parents 9bd2a0a + da1a71c commit d8ce826
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion pkg/azurefile/controllerserver.go
Original file line number Diff line number Diff line change
Expand Up @@ -583,7 +583,12 @@ func (d *Driver) CreateVolume(ctx context.Context, req *csi.CreateVolumeRequest)
d.volMap.Delete(volName)
return d.CreateVolume(ctx, req)
}
return nil, status.Errorf(codes.Internal, "failed to create file share(%s) on account(%s) type(%s) subsID(%s) rg(%s) location(%s) size(%d), error: %v", validFileShareName, account, sku, subsID, resourceGroup, location, fileShareSize, err)
if req.GetVolumeContentSource() != nil && strings.Contains(err.Error(), "ShareAlreadyExists") {
// for snapshot restore and volume cloning, ignore ShareAlreadyExists error since the file share should be created first
klog.Warningf("create file share(%s) on account(%s) type(%s) subID(%s) rg(%s) location(%s) size(%d), ignore ShareAlreadyExists error for snapshot restore and volume cloning, error: %v", validFileShareName, accountName, sku, subsID, resourceGroup, location, fileShareSize, err)
} else {
return nil, status.Errorf(codes.Internal, "failed to create file share(%s) on account(%s) type(%s) subsID(%s) rg(%s) location(%s) size(%d), error: %v", validFileShareName, account, sku, subsID, resourceGroup, location, fileShareSize, err)
}
}
if req.GetVolumeContentSource() != nil {
accountSASToken, authAzcopyEnv, err := d.getAzcopyAuth(ctx, accountName, accountKey, storageEndpointSuffix, accountOptions, secret, secretName, secretNamespace, false)
Expand Down

0 comments on commit d8ce826

Please # to comment.