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.

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

octopus: librbd: allow interrupted trash move request to be restarted #40387

Merged
merged 5 commits into from May 21, 2021
Merged

octopus: librbd: allow interrupted trash move request to be restarted #40387

merged 5 commits into from May 21, 2021

Conversation

singuliere
Copy link
Contributor

backport tracker: https://tracker.ceph.com/issues/49766

backport of #40010
parent tracker: https://tracker.ceph.com/issues/49716

this backport was staged using ceph-backport.sh version 16.0.0.6848
find the latest version at https://github.com/ceph/ceph/blob/master/src/script/ceph-backport.sh

Jason Dillaman added 5 commits March 24, 2021 21:40
@singuliere
librbd/api: helper method for natively listing the trash
b49a878 
The existing list method converts the native TrashImageSpec to the
API's rbd_trash_image_info_t which is missing the source field.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 21adc92)
@singuliere
librbd/api: allow an interrupted trash move to be restarted
8fb5525 
Search the trash entries for a matching image name that is
still in the moving state and allow the operation to be
restarted.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit ed2d696)
@singuliere
librbd/api: trash remove/purge should indicate interrupted move
1638c4f 
This will help the user self-diagnose that a trash move operation
was interrupted and therefore the state is invalid.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit c808abe)
@singuliere
librbd/trash: don't return -ENOENT error from move state machine
7830b1e 
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit f6ed98d)
@singuliere
rbd: clarify trash remove error code from interrupted move
4cdf4fb 
Fixes: https://tracker.ceph.com/issues/49716
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 138d71f)
@github-actions github-actions bot added this to the octopus milestone Mar 24, 2021
@singuliere singuliere requested review from a team as code owners April 12, 2021 17:34
@singuliere singuliere requested review from pereman2 and Waadkh7 and removed request for a team April 12, 2021 17:34
@idryomov idryomov changed the base branch from octopus to octopus-saved April 20, 2021 17:30
@idryomov idryomov changed the base branch from octopus-saved to octopus April 20, 2021 17:30
@singuliere
Copy link
Contributor Author

jenkins test this please

1 similar comment
@singuliere
Copy link
Contributor Author

jenkins test this please

@singuliere
Copy link
Contributor Author

https://jenkins.ceph.com/job/ceph-pull-requests/74373/consoleText

189/198 Test  #10: run-rbd-unit-tests-61.sh ................***Failed  164.52 sec
++ dirname /home/jenkins-build/build/workspace/ceph-pull-requests/src/test/run-rbd-unit-tests.sh
+ source /home/jenkins-build/build/workspace/ceph-pull-requests/src/test/detect-build-env-vars.sh
++ '[' -n /home/jenkins-build/build/workspace/ceph-pull-requests/build ']'
++ '[' -n /home/jenkins-build/build/workspace/ceph-pull-requests ']'
++ '[' -n /home/jenkins-build/build/workspace/ceph-pull-requests/build/bin ']'
++ '[' -n /home/jenkins-build/build/workspace/ceph-pull-requests/build/lib ']'
++ echo 'Enivronment Variables Already Set'
Enivronment Variables Already Set
+ PATH=/home/jenkins-build/build/workspace/ceph-pull-requests/build/bin:/home/jenkins-build/build/workspace/ceph-pull-requests/build/bin:/home/jenkins-build/build/workspace/ceph-pull-requests/src:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/snap/bin
+ '[' 1 = 0 ']'
+ '[' 1 = 1 -a 61 = N ']'
+ TESTS=61
+ for i in ${TESTS}
+ RBD_FEATURES=61
+ unittest_librbd
seed 3836070
[==========] Running 977 tests from 88 test suites.
[----------] Global test environment set-up.
[----------] 2 tests from TestMockConfigWatcher
[ RUN      ] TestMockConfigWatcher.GlobalConfig
Failed to load class: cas (/home/jenkins-build/build/workspace/ceph-pull-requests/build/lib/libcls_cas.so): /home/jenkins-build/build/workspace/ceph-pull-requests/build/lib/libcls_cas.so: undefined symbol: _Z13cls_has_chunkPvNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE
Failed to load class: log (/home/jenkins-build/build/workspace/ceph-pull-requests/build/lib/libcls_log.so): /home/jenkins-build/build/workspace/ceph-pull-requests/build/lib/libcls_log.so: undefined symbol: _Z24cls_cxx_map_write_headerPvPN4ceph6buffer7v15_2_04listE
Failed to load class: rgw (/home/jenkins-build/build/workspace/ceph-pull-requests/build/lib/libcls_rgw.so): /home/jenkins-build/build/workspace/ceph-pull-requests/build/lib/libcls_rgw.so: undefined symbol: _Z19cls_current_versionPv
Failed to load class: user (/home/jenkins-build/build/workspace/ceph-pull-requests/build/lib/libcls_user.so): /home/jenkins-build/build/workspace/ceph-pull-requests/build/lib/libcls_user.so: undefined symbol: _Z24cls_cxx_map_write_headerPvPN4ceph6buffer7v15_2_04listE

@singuliere
Copy link
Contributor Author

jenkins run make check

@singuliere
Copy link
Contributor Author

jenkins test make check

@jdurgin jdurgin changed the base branch from octopus to octopus-saved May 14, 2021 21:57
@jdurgin jdurgin changed the base branch from octopus-saved to octopus May 14, 2021 21:57
@neha-ojha neha-ojha added the rbd label May 19, 2021
@neha-ojha neha-ojha requested a review from idryomov May 19, 2021 16:18
@yuriw yuriw added the needs-qa label May 19, 2021
@yuriw yuriw merged commit cf92e15 into ceph:octopus May 21, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@idryomov idryomov idryomov approved these changes

@pereman2 pereman2 Awaiting requested review from pereman2

@Waadkh7 Waadkh7 Awaiting requested review from Waadkh7

Assignees
No one assigned
Labels
needs-qa octopus-batch-1 rbd wip-yuri2-testing
Projects
None yet
Milestone
octopus
5 participants
@singuliere @idryomov @tchaikov @yuriw @neha-ojha