Skip to content

chore: append subsid in snapshot id #2254

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 10, 2024
Merged

Conversation

andyzhangx
Copy link
Member

@andyzhangx andyzhangx commented Dec 9, 2024

What type of PR is this?
/kind feature

What this PR does / why we need it:
chore: append subsid in snapshot id, this could make snapshot copy across different subs work

 - before the change

I1208 10:28:01.445822       1 utils.go:101] GRPC call: /csi.v1.Controller/CreateSnapshot
I1208 10:28:01.445904       1 utils.go:102] GRPC request: {"name":"snapshot-d5ba2ca6-a632-4de2-9da6-fed6fb7b8a66","source_volume_id":"capz-0srnt6#f5181a7da05654559a366ab#pvc-1f27c75b-5c53-47f5-b87a-30edfad0ce84###azurefile-7082"}
I1208 10:28:01.555096       1 controllerserver.go:1291] list snapshot of share(pvc-1f27c75b-5c53-47f5-b87a-30edfad0ce84) under account(f5181a7da05654559a366ab) rg(capz-0srnt6) subsID() with total number(1)
I1208 10:28:01.894431       1 controllerserver.go:940] created share snapshot: 2024-12-08T10:28:01.0000000Z, time: 2024-12-08 10:28:01 +0000 UTC, quota: 0GiB
I1208 10:28:01.894625       1 controllerserver.go:951] get file share(pvc-1f27c75b-5c53-47f5-b87a-30edfad0ce84) account(f5181a7da05654559a366ab) quota from cloud
I1208 10:28:01.997267       1 azure_metrics.go:118] "Observed Request Latency" latency_seconds=0.551169793 request="azurefile_csi_driver_controller_create_snapshot" resource_group="capz-0srnt6" subscription_id="46678f10-4bbb-447e-98e8-d2829589f2d8" source="file.csi.azure.com" source_resource_id="capz-0srnt6#f5181a7da05654559a366ab#pvc-1f27c75b-5c53-47f5-b87a-30edfad0ce84###azurefile-7082" snapshot_name="snapshot-d5ba2ca6-a632-4de2-9da6-fed6fb7b8a66" result_code="succeeded"
I1208 10:28:01.997310       1 utils.go:108] GRPC response: {"snapshot":{"creation_time":{"seconds":1733653681},"ready_to_use":true,"size_bytes":107374182400,"snapshot_id":"capz-0srnt6#f5181a7da05654559a366ab#pvc-1f27c75b-5c53-47f5-b87a-30edfad0ce84###azurefile-7082#2024-12-08T10:28:01.0000000Z","source_volume_id":"capz-0srnt6#f5181a7da05654559a366ab#pvc-1f27c75b-5c53-47f5-b87a-30edfad0ce84###azurefile-7082"}}

 - after the change
I1210 09:42:47.989221       1 utils.go:101] GRPC call: /csi.v1.Controller/CreateSnapshot
I1210 09:42:47.989243       1 utils.go:102] GRPC request: {"name":"snapshot-ce98bb28-c14a-4b4d-9371-60fa26dc6ccb","source_volume_id":"capz-xohk8b#f2d175f12bd584cf08c2d19#pvc-7848ce54-f5d1-493c-b728-f88a90249c6c###azurefile-1707"}
I1210 09:42:48.212875       1 controllerserver.go:1301] list snapshot of share(pvc-7848ce54-f5d1-493c-b728-f88a90249c6c) under account(f2d175f12bd584cf08c2d19) rg(capz-xohk8b) subsID() with total number(1)
I1210 09:42:48.713356       1 controllerserver.go:949] created share snapshot: 2024-12-10T09:42:48.0000000Z, time: 2024-12-10 09:42:48 +0000 UTC, quota: 0GiB
I1210 09:42:48.713410       1 controllerserver.go:960] get file share(pvc-7848ce54-f5d1-493c-b728-f88a90249c6c) account(f2d175f12bd584cf08c2d19) quota from cloud
I1210 09:42:48.803541       1 azure_metrics.go:118] "Observed Request Latency" latency_seconds=0.813851783 request="azurefile_csi_driver_controller_create_snapshot" resource_group="capz-xohk8b" subscription_id="46678f10-4bbb-447e-98e8-d2829589f2d8" source="file.csi.azure.com" source_resource_id="capz-xohk8b#f2d175f12bd584cf08c2d19#pvc-7848ce54-f5d1-493c-b728-f88a90249c6c###azurefile-1707" snapshot_name="snapshot-ce98bb28-c14a-4b4d-9371-60fa26dc6ccb" result_code="succeeded"
I1210 09:42:48.803868       1 utils.go:108] GRPC response: {"snapshot":{"creation_time":{"seconds":1733823768},"ready_to_use":true,"size_bytes":107374182400,"snapshot_id":"capz-xohk8b#f2d175f12bd584cf08c2d19#pvc-7848ce54-f5d1-493c-b728-f88a90249c6c###azurefile-1707#46678f10-4bbb-447e-98e8-d2829589f2d8#2024-12-10T09:42:48.0000000Z","source_volume_id":"capz-xohk8b#f2d175f12bd584cf08c2d19#pvc-7848ce54-f5d1-493c-b728-f88a90249c6c###azurefile-1707"}}

Which issue(s) this PR fixes:

Fixes #

Requirements:

Special notes for your reviewer:

Release note:

chore: append subsid in snapshot id

@k8s-ci-robot k8s-ci-robot added kind/feature Categorizes issue or PR as related to a new feature. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Dec 9, 2024
@k8s-ci-robot k8s-ci-robot requested a review from cvvz December 9, 2024 13:55
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: andyzhangx

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot requested a review from gnufied December 9, 2024 13:55
@k8s-ci-robot k8s-ci-robot added approved Indicates a PR has been approved by an approver from all required OWNERS files. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Dec 9, 2024
@andyzhangx andyzhangx force-pushed the append-subsid-in-snapshot-id branch 2 times, most recently from aed7831 to be89d93 Compare December 10, 2024 02:25
@andyzhangx
Copy link
Member Author

/retest

@andyzhangx andyzhangx force-pushed the append-subsid-in-snapshot-id branch from be89d93 to 614ec36 Compare December 10, 2024 04:14
@andyzhangx andyzhangx force-pushed the append-subsid-in-snapshot-id branch from 614ec36 to 091e046 Compare December 10, 2024 07:27
@k8s-ci-robot k8s-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Dec 10, 2024
@andyzhangx
Copy link
Member Author

/retest

@andyzhangx andyzhangx merged commit 802cd27 into master Dec 10, 2024
28 of 29 checks passed
@andyzhangx
Copy link
Member Author

/cherrypick release-1.31

@andyzhangx
Copy link
Member Author

/cherrypick release-1.30

@k8s-infra-cherrypick-robot

@andyzhangx: new pull request created: #2257

In response to this:

/cherrypick release-1.31

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@k8s-infra-cherrypick-robot

@andyzhangx: #2254 failed to apply on top of branch "release-1.30":

Applying: chore: append subsid in snapshot id
Using index info to reconstruct a base tree...
M	pkg/azurefile/controllerserver.go
M	pkg/azurefile/utils.go
M	pkg/azurefile/utils_test.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/azurefile/utils_test.go
CONFLICT (content): Merge conflict in pkg/azurefile/utils_test.go
Auto-merging pkg/azurefile/utils.go
CONFLICT (content): Merge conflict in pkg/azurefile/utils.go
Auto-merging pkg/azurefile/controllerserver.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 chore: append subsid in snapshot id

In response to this:

/cherrypick release-1.30

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@andyzhangx andyzhangx deleted the append-subsid-in-snapshot-id branch January 17, 2025 14:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/feature Categorizes issue or PR as related to a new feature. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants