Sage Weil
4da29a07cf
Merge branch 'wip-names!-in!-space!' of git://github.com/adamemerson/ceph
...
Reviewed-by: Jesse Williamson <jwilliamson@suse.de>
# Conflicts:
# src/cls/rbd/cls_rbd.cc
# src/cls/rbd/cls_rbd_types.cc
2018-01-11 16:14:44 -06:00
Sage Weil
c6d6676422
Merge pull request #19099 from ifed01/wip-ifed-faster-pglog
...
osd: eliminate ineffective container operations
Reviewed-by: Kefu Chai <kchai@redhat.com>
2018-01-11 15:50:52 -06:00
Sage Weil
c1ec2752ee
Merge pull request #19180 from theanalyst/tools/rados-omap-clear
...
tools: rados add a cli option to clear omap keys
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2018-01-11 15:50:12 -06:00
Sage Weil
47c925a765
Merge pull request #19872 from tchaikov/wip-random_shuffle
...
osd: s/random_shuffle()/shuffle()/
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Willem Jan Withagen <wjw@digiware.nl>
2018-01-11 15:49:31 -06:00
Sage Weil
c4a7881876
Merge pull request #19881 from liewegas/wip-kill-crush-location
...
ceph-crush-location: remove
Reviewed-by: Wido den Hollander <wido@widodh.nl>
2018-01-11 15:48:29 -06:00
Jason Dillaman
ac3855e9cf
Merge pull request #11544 from VictorDenisov/consistency_groups_snapshots
...
librbd: group snapshots
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2018-01-11 15:29:27 -05:00
Jason Dillaman
bbbfd27be9
rbd-mirror: fix valgrind false positive from new boost release
...
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2018-01-11 15:27:47 -05:00
Casey Bodley
ce8ed30925
Merge pull request #19924 from rzarzynski/wip-rgw-drop-dump_uri_from_state
...
rgw: drop dump_uri_from_state() which isn't used anymore.
Reviewed-by: Matt Benjamin <mbenjamin@redhat.com>
Reviewed-by: Casey Bodley <cbodley@redhat.com>
2018-01-11 12:05:31 -05:00
Jason Dillaman
0088640173
librbd: ensure enums are prefixed w/ RBD_ to avoid collisions
...
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2018-01-11 11:58:54 -05:00
Jason Dillaman
854b2bbffb
librbd: fix false-positive compiler warning
...
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2018-01-11 10:52:26 -05:00
Jason Dillaman
072004ad06
test/pybind: corrected failures due to test execution ordering
...
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2018-01-11 10:38:23 -05:00
Jason Dillaman
edc3bd7388
librbd: group snapshots should be linked to image pool (not data pool)
...
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2018-01-11 10:38:23 -05:00
Jason Dillaman
f61cc5741f
rbd: restore snap list by image id functionality
...
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2018-01-11 10:38:23 -05:00
Jason Dillaman
725722bb5e
cls/rbd: combined group_snap_add and group_snap_update
...
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2018-01-11 10:38:23 -05:00
Jason Dillaman
7f29a98db5
librbd: fix ImageCtx::get_snap_id method
...
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2018-01-11 10:38:23 -05:00
Jason Dillaman
8d68fa2a8e
librbd: fixed memory leak and use-after-free in group snap API
...
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2018-01-11 10:38:23 -05:00
Jason Dillaman
31a382f1ec
rbd: utilize '<name>@<snap>' format when creating/removing group snaps
...
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2018-01-11 10:38:23 -05:00
Jason Dillaman
75652b057d
pybind/rbd: added snap_get_group_namespace API method
...
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2018-01-11 10:38:23 -05:00
Jason Dillaman
2f838104d8
librbd: added missing C API version for rbd_snap_get_group_namespace
...
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2018-01-11 10:38:23 -05:00
Jason Dillaman
d761985269
librbd: moved new snapshot API methods to separate class
...
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2018-01-11 10:38:23 -05:00
Jason Dillaman
2f3f6028d1
rbd: wrap object section around group snap list formatter
...
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2018-01-11 10:38:23 -05:00
Victor Denisov
18ea889807
rbd: translate pool id into name
...
Signed-off-by: Victor Denisov <denisovenator@gmail.com>
2018-01-11 10:38:23 -05:00
Victor Denisov
85f0348e3c
rbd: translate group pool to name
...
Signed-off-by: Victor Denisov <denisovenator@gmail.com>
2018-01-11 10:38:23 -05:00
Victor Denisov
2d53795d29
rbd: fix cli tests
...
Signed-off-by: Victor Denisov <denisovenator@gmail.com>
2018-01-11 10:38:23 -05:00
Victor Denisov
586ae25816
rbd: drop consistency from Info
...
Signed-off-by: Victor Denisov <denisovenator@gmail.com>
2018-01-11 10:38:23 -05:00
Victor Denisov
746385952c
rbd: produce state string instead of integer
...
Signed-off-by: Victor Denisov <denisovenator@gmail.com>
2018-01-11 10:38:23 -05:00
Victor Denisov
e9cf88710e
rbd: Add snap rm alias
...
Signed-off-by: Victor Denisov <denisovenator@gmail.com>
2018-01-11 10:38:23 -05:00
Victor Denisov
e0a8815105
rbd: Change message format
...
Signed-off-by: Victor Denisov <denisovenator@gmail.com>
2018-01-11 10:38:23 -05:00
Victor Denisov
a4304a9c3c
rbd: Inline options function
...
Signed-off-by: Victor Denisov <denisovenator@gmail.com>
2018-01-11 10:38:23 -05:00
Victor Denisov
a0cdcd8a7a
rbd: Drop consistency from tools
...
Signed-off-by: Victor Denisov <denisovenator@gmail.com>
2018-01-11 10:38:23 -05:00
Victor Denisov
99b996a510
rbd: Fix section name
...
Signed-off-by: Victor Denisov <denisovenator@gmail.com>
2018-01-11 10:38:23 -05:00
Victor Denisov
06d496e2c8
test/pybind: drop consistency from test name
...
Signed-off-by: Victor Denisov <denisovenator@gmail.com>
2018-01-11 10:38:23 -05:00
Victor Denisov
67b7d5c84c
rbd: Drop consistency from help
...
Signed-off-by: Victor Denisov <denisovenator@gmail.com>
2018-01-11 10:38:23 -05:00
Victor Denisov
45e85db23c
librbd: Drop consistency from pybind
...
Signed-off-by: Victor Denisov <denisovenator@gmail.com>
2018-01-11 10:38:23 -05:00
Victor Denisov
a946d6b0b8
librbd: Fix indentation
...
Signed-off-by: Victor Denisov <denisovenator@gmail.com>
2018-01-11 10:38:23 -05:00
Victor Denisov
68d70afbb1
librbd: use RBD_GROUP_INVALID_POOL
...
Signed-off-by: Victor Denisov <denisovenator@gmail.com>
2018-01-11 10:38:23 -05:00
Victor Denisov
a5de40ab34
librbd: Drop word consistency in librbd
...
Signed-off-by: Victor Denisov <denisovenator@gmail.com>
2018-01-11 10:38:23 -05:00
Victor Denisov
3087646e79
librbd: remove get_snap_id_from_namespace
...
Signed-off-by: Victor Denisov <denisovenator@gmail.com>
2018-01-11 10:38:23 -05:00
Victor Denisov
280bda2dd8
librbd: fixup Move function declaration
...
Signed-off-by: Victor Denisov <denisovenator@gmail.com>
2018-01-11 10:38:23 -05:00
Victor Denisov
74908f4bc1
librbd: rename group state to 'incomplete'
...
Signed-off-by: Victor Denisov <denisovenator@gmail.com>
2018-01-11 10:38:23 -05:00
Victor Denisov
c187075e92
cls_rbd: initialize group state
...
Signed-off-by: Victor Denisov <denisovenator@gmail.com>
2018-01-11 10:38:23 -05:00
Victor Denisov
61ff95c1ec
cls_rbd: Remove h_group_create
...
Signed-off-by: Victor Denisov <denisovenator@gmail.com>
2018-01-11 10:38:23 -05:00
Victor Denisov
297e33204f
cls_rbd: Address comments
...
Signed-off-by: Victor Denisov <denisovenator@gmail.com>
2018-01-11 10:38:23 -05:00
Victor Denisov
d95b791e8d
qa/workunits/rbd: Add tests for consistency groups
...
Signed-off-by: Victor Denisov <denisovenator@gmail.com>
2018-01-11 10:38:23 -05:00
Victor Denisov
50ca45fc95
rbd: Add group snapshot command
...
Signed-off-by: Victor Denisov <denisovenator@gmail.com>
2018-01-11 10:38:23 -05:00
Victor Denisov
c7c7e5a75c
librbd: Add group snapshot operations
...
Signed-off-by: Victor Denisov <denisovenator@gmail.com>
2018-01-11 10:38:23 -05:00
Victor Denisov
efb05b5195
cls_rbd: Add group snapshot operations to cls_rbd
...
Signed-off-by: Victor Denisov <denisovenator@gmail.com>
2018-01-11 10:38:23 -05:00
Mykola Golub
797bd65565
Merge pull request #19919 from wjwithagen/wip-wjw-rbd-ggate-fix
...
rbd-ggate: fix syntax error.
Reviewed-by: Mykola Golub <mgolub@suse.com>
2018-01-11 17:09:52 +02:00
Sage Weil
6e8804810f
Merge pull request #19917 from yaozongyou/rgw-remove-unused-cls-user-add-bucket
...
rgw: remove unused cls_user_add_bucket
Reviewed-by: Sage Weil <sage@redhat.com>
2018-01-11 08:56:52 -06:00
Casey Bodley
29816d220f
Merge pull request #19699 from qrGitHub/wip-rgw-useless-line
...
rgw: remove useless lines in RGWDeleteBucket::execute
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Abhishek Lekshmanan <abhishek@suse.com>
2018-01-11 09:32:33 -05:00