Skip to content
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.

Sign up for GitHub

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

Jump to bottom

rbd: update snap RbdImageName #4152

Merged
merged 1 commit into from
Sep 28, 2023
Merged

rbd: update snap RbdImageName #4152

merged 1 commit into from
Sep 28, 2023

Conversation

iPraveenParihar
Copy link
Contributor

Describe what this PR does

This PR updates the snapshot RbdImageName with the clone
RbdImageName before snapshot creation. This will fix the
incorrect log statement.

Fixes: #4151

@mergify mergify bot added the component/rbd Issues related to RBD label Sep 27, 2023
@Rakshith-R
Copy link
Contributor

@Mergifyio rebase

@iPraveenParihar @Rakshith-R
rbd: update snap RbdImageName
40209aa 
This commit updates the snapshot RbdImageName with the clone
RbdImageName before snapshot creation. This will fix the
incorrect log statement.

Signed-off-by: Praveen M <[email protected]>
@mergify
Copy link
Contributor

mergify bot commented Sep 28, 2023

rebase

✅ Branch has been successfully rebased

@nixpanic nixpanic added the ok-to-test Label to trigger E2E tests label Sep 28, 2023
@ceph-csi-bot
Copy link
Collaborator

/test ci/centos/upgrade-tests-cephfs

@ceph-csi-bot
Copy link
Collaborator

/test ci/centos/upgrade-tests-rbd

@ceph-csi-bot
Copy link
Collaborator

/test ci/centos/k8s-e2e-external-storage/1.28

@ceph-csi-bot
Copy link
Collaborator

/test ci/centos/k8s-e2e-external-storage/1.26

@ceph-csi-bot
Copy link
Collaborator

/test ci/centos/mini-e2e-helm/k8s-1.28

@ceph-csi-bot
Copy link
Collaborator

/test ci/centos/mini-e2e-helm/k8s-1.26

@ceph-csi-bot
Copy link
Collaborator

/test ci/centos/mini-e2e/k8s-1.28

@ceph-csi-bot
Copy link
Collaborator

/test ci/centos/k8s-e2e-external-storage/1.27

@ceph-csi-bot
Copy link
Collaborator

/test ci/centos/mini-e2e/k8s-1.26

@ceph-csi-bot
Copy link
Collaborator

/test ci/centos/mini-e2e-helm/k8s-1.27

@ceph-csi-bot
Copy link
Collaborator

/test ci/centos/mini-e2e/k8s-1.27

@ceph-csi-bot ceph-csi-bot removed the ok-to-test Label to trigger E2E tests label Sep 28, 2023
nixpanic
nixpanic reviewed Sep 28, 2023
View reviewed changes
internal/rbd/controllerserver.go
@@ -1340,10 +1340,10 @@ func (cs *ControllerServer) doSnapshotClone(
return nil, err
}

// update rbd image name
rbdSnap.RbdImageName = cloneRbd.RbdImageName
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Instead of logging rbdSnap, why not log cloneRbd?

Or, would it not be cleaner to set RbdImageName inside cloneRbd.createSnapshot()?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Or, would it not be cleaner to set RbdImageName inside cloneRbd.createSnapshot()?

looks good to me, this PR got merged. Will raise another PR for the same.

@mergify mergify bot merged commit e504987 into ceph:devel Sep 28, 2023
24 checks passed
@iPraveenParihar iPraveenParihar mentioned this pull request Sep 29, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nixpanic nixpanic nixpanic left review comments

@Rakshith-R Rakshith-R Rakshith-R approved these changes

@yati1998 yati1998 yati1998 approved these changes

Assignees
No one assigned
Labels
component/rbd Issues related to RBD
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Incorrect log during /CreateSnapshot
5 participants
@iPraveenParihar @Rakshith-R @ceph-csi-bot @nixpanic @yati1998