Jason Dillaman
b2b18998c7
Merge pull request #10487 from yangdongsheng/rbd_export
...
rbd: introduce v2 format for rbd export/import
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2017-02-19 12:18:04 -05:00
Dongsheng Yang
5b1458290d
rbd: import/export/mergediff: use STD[IN|OUT]_FILENO instead of 0 or 1
...
Signed-off-by: Dongsheng Yang <dongsheng.yang@easystack.cn>
2017-02-19 20:42:03 +08:00
Dongsheng Yang
fedf772ba1
rbd: import: use read() instead of lseek() when from_stdin is true
...
Signed-off-by: Dongsheng Yang <dongsheng.yang@easystack.cn>
2017-02-19 20:42:03 +08:00
Dongsheng Yang
aa913ced12
rbd: add docs for new format of rbd export.
...
Signed-off-by: Dongsheng Yang <dongsheng.yang@easystack.cn>
2017-02-19 20:42:03 +08:00
Dongsheng Yang
8d2a6139fb
rbd: combine the namespaces of export_diff and export_full, import_diff and import.
...
Signed-off-by: Dongsheng Yang <dongsheng.yang@easystack.cn>
2017-02-19 20:42:03 +08:00
Dongsheng Yang
c2356bee4c
rbd: import: decode file data in le64 for compatability on different platform
...
Signed-off-by: Dongsheng Yang <dongsheng.yang@easystack.cn>
2017-02-19 20:42:03 +08:00
Dongsheng Yang
435104a294
rbd: import_diff/export_diff: encode length for each tag.
...
Signed-off-by: Dongsheng Yang <dongsheng.yang@easystack.cn>
2017-02-19 20:42:03 +08:00
Dongsheng Yang
08d0c2ab9f
rbd: refactor export/import to v1 and v2 methods.
...
Signed-off-by: Dongsheng Yang <dongsheng.yang@easystack.cn>
2017-02-19 20:42:03 +08:00
Dongsheng Yang
f16899a749
rbd: use the unified --export-format option for rbd export and rbd import
...
Signed-off-by: Dongsheng Yang <dongsheng.yang@easystack.cn>
2017-02-19 20:42:03 +08:00
Dongsheng Yang
4ee764f9e1
qa/workunit/rbd: import_export.sh: add image priorities exporting and importing test cases.
...
Signed-off-by: Dongsheng Yang <dongsheng.yang@easystack.cn>
2017-02-19 20:42:03 +08:00
Dongsheng Yang
d7479a09b6
rbd: import/export image stripe_unit and stripe_count.
...
Signed-off-by: Dongsheng Yang <dongsheng.yang@easystack.cn>
2017-02-19 20:42:03 +08:00
Dongsheng Yang
912ff4d2ae
rbd: import/export features of image
...
Signed-off-by: Dongsheng Yang <dongsheng.yang@easystack.cn>
2017-02-19 20:42:03 +08:00
Dongsheng Yang
8679521a03
rbd: import/export image_order.
...
Signed-off-by: Dongsheng Yang <dongsheng.yang@easystack.cn>
2017-02-19 20:42:03 +08:00
Dongsheng Yang
55edd81658
qa/workunit/rbd: add test case for --import/export-format in import_export.sh
...
Signed-off-by: Dongsheng Yang <dongsheng.yang@easystack.cn>
2017-02-19 20:42:03 +08:00
Dongsheng Yang
26b858ee1e
rbd: introduce --export-format to export command
...
Signed-off-by: Dongsheng Yang <dongsheng.yang@easystack.cn>
2017-02-19 20:42:03 +08:00
Dongsheng Yang
5e034600a2
rbd: introduce --import-format to import command
...
Signed-off-by: Dongsheng Yang <dongsheng.yang@easystack.cn>
2017-02-19 20:42:03 +08:00
Dongsheng Yang
58c8e8cd00
rbd: refactor do_import_diff to accept fd.
...
Signed-off-by: Dongsheng Yang <dongsheng.yang@easystack.cn>
2017-02-19 20:42:03 +08:00
Dongsheng Yang
bc80b147ac
rbd: refactor do_export_diff to accept fd
...
Signed-off-by: Dongsheng Yang <dongsheng.yang@easystack.cn>
2017-02-19 20:42:03 +08:00
Dongsheng Yang
de671d77a1
rbd: move do_import_diff out from namespace of import_diff
...
Signed-off-by: Dongsheng Yang <dongsheng.yang@easystack.cn>
2017-02-19 20:42:03 +08:00
Dongsheng Yang
21be324e11
rbd: move do_export_diff out from namespace of export_diff.
...
Signed-off-by: Dongsheng Yang <dongsheng.yang@easystack.cn>
2017-02-19 20:42:03 +08:00
Dongsheng Yang
f6192de7af
rbd: squash ImportDiff.cc into Import.cc.
...
Signed-off-by: Dongsheng Yang <dongsheng.yang@easystack.cn>
2017-02-19 20:42:03 +08:00
Dongsheng Yang
262c8d321c
rbd: squash ExportDiff.cc into Export.cc
...
Signed-off-by: Dongsheng Yang <dongsheng.yang@easystack.cn>
2017-02-19 20:42:03 +08:00
Dongsheng Yang
12f50c40a5
rbd: use macro for rbd diff tags
...
Signed-off-by: Dongsheng Yang <dongsheng.yang@easystack.cn>
2017-02-19 20:41:28 +08:00
Dongsheng Yang
4658cf1c61
rbd: finish the pc in importing even if from_stdin.
...
Signed-off-by: Dongsheng Yang <dongsheng.yang@easystack.cn>
2017-02-19 20:41:28 +08:00
Dongsheng Yang
e10b0c0263
rbd: remove image in error handling of importing
...
Signed-off-by: Dongsheng Yang <dongsheng.yang@easystack.cn>
2017-02-19 20:41:28 +08:00
Dongsheng Yang
636d7cd21e
rbd/Import: fix the indent of labels
...
Signed-off-by: Dongsheng Yang <dongsheng.yang@easystack.cn>
2017-02-19 20:41:28 +08:00
Sage Weil
c1c1f2e408
Merge pull request #13207 from liewegas/wip-mapping
...
mon: restructure prime_pg_temp around a full pg mapping calculated on multiple CPUs
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-02-18 12:58:05 -06:00
Sage Weil
2a4be500d8
Merge pull request #13420 from liewegas/wip-18929
...
osd/PG: restrict want_acting to up+acting on recovery completion
Reviewed-by: Samuel Just <sjust@redhat.com>
2017-02-18 12:57:00 -06:00
Sage Weil
9762dbfb26
Merge pull request #13479 from LiumxNL/fix-monc-rand
...
mon/MonClient: random all ranks then pick first_n
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-02-18 12:38:29 -06:00
Jason Dillaman
2c2b7abf93
Merge pull request #13482 from idryomov/wip-qa-krbd-data-pool
...
qa: add workunit to test krbd data-pool support
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2017-02-18 09:00:59 -05:00
Mingxin Liu
9b546b6906
mon/MonClient: random all ranks then pick first_n
...
Signed-off-by: Mingxin Liu <mingxin@xsky.com>
2017-02-18 21:57:45 +08:00
Kefu Chai
49740fc0fb
Merge pull request #13493 from liewegas/wip-log-split-index
...
osd/PGLog: fix index for parent and child log on split
Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2017-02-18 18:31:24 +08:00
Kefu Chai
5e98ce933c
Merge pull request #13458 from tchaikov/wip-silence-gcc-warnings
...
include/denc, kv: silence gcc warnings
Reviewed-by: Adam C. Emerson <aemerson@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
2017-02-18 18:24:46 +08:00
Kefu Chai
9d7dd22339
Merge pull request #13462 from tanghaodong25/reweight-by-pg
...
mon/OSDMonitor: some cleanup for reweight-by-pg
Reviewed-by: Sage Weil <sage@redhat.com>
2017-02-18 18:23:55 +08:00
Kefu Chai
780f4c08bc
Merge pull request #13473 from tchaikov/wip-coverity-fixes
...
msg, messages: coverity fixes
Reviewed-by: Sage Weil <sage@redhat.com>
2017-02-18 18:22:47 +08:00
Kefu Chai
0603794d53
Merge pull request #12977 from weixiaowilliam/crc32c_opt
...
crc32c: optimize aarch64 crc32c implementation
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-02-18 17:13:50 +08:00
Kefu Chai
bb6216752e
Merge pull request #13428 from xiexingguo/wip-flush-cache
...
os/bluestore: add flush_store_cache cmd
Reviewed-by: Sage Weil <sage@redhat.com>
2017-02-18 16:45:36 +08:00
Kefu Chai
f0da8aa178
Merge pull request #13430 from majianpeng/tracepointprovier
...
common/TracepointProvider: add assert if dlopen error.
Reviewed-by: Sage Weil <sage@redhat.com>
2017-02-18 16:45:01 +08:00
Kefu Chai
2a05daa8f6
Merge pull request #13335 from ovh/wip-clang-compilation-fix
...
common: Fix clang compilation
Reviewed-by: Willem Jan Withagen <wjw@digiware.nl>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-02-18 16:43:51 +08:00
Haomai Wang
6dcd79cdcd
Merge pull request #13435 from yuyuyu101/wip-rdma-leak
...
msg/async/rdm: fix leak when existing failure in ip network
Reviewed-by: Adir lev <adirl@mellanox.com>
2017-02-18 14:14:32 +08:00
Haomai Wang
e120aa457b
Merge pull request #13511 from tangwenjun3/wip-nvme
...
os/bluestore: fix bug in aio_read()
Reviewed-by: Haomai Wang <haomai@xsky.com>
2017-02-18 14:10:37 +08:00
tangwenjun3
2bfeefb9de
os/bluestore:fix bug in aio_read()
...
fixed compilation issue in aio_read() when enable spdk
Signed-off-by: tangwenjun <tang.wenjun3@zte.com.cn>
2017-02-18 13:49:22 +08:00
Haomai Wang
a6db737115
Merge pull request #13484 from yuyuyu101/wip-rdma-perf-counter
...
msg/async/rdma: add perf counters to RDMA backend
Reviewed-by: Adir lev <adirl@mellanox.com>
2017-02-18 13:31:45 +08:00
Haomai Wang
4225e2b646
msg/async/rdma: add perf counters to RDMA backend
...
Signed-off-by: Haomai Wang <haomai@xsky.com>
2017-02-18 13:30:22 +08:00
Matt Benjamin
408053a07e
Merge pull request #10156 from rzarzynski/wip-rgw-controllable-204
...
rgw: make sending Content-Length in 204 and 304 responses controllable
2017-02-17 15:56:06 -05:00
Dan Mick
bd025bbd8c
Merge pull request #13467 from liewegas/wip-init-ceph
...
init-ceph: fix ceph user args
Reviewed-by: Dan Mick <dmick@redhat.com>
2017-02-17 12:52:09 -08:00
Sage Weil
a6ead99877
osd/PGLog: avoid return by value on ginormous log
...
Signed-off-by: Sage Weil <sage@redhat.com>
2017-02-17 14:50:44 -05:00
Sage Weil
643ae42cf2
osd/PGLog: reindex properly on pg log split
...
When pg_log_t::split_out_child() runs it builds the list, which means the
old indexes are wrong (the point to bad memory), but index() will not
rebuild them because ever since b858e869e7
we won't rebuild them if they are already built.
Fix that by calling unindex() before the split.
Further, the new child log also needs to be indexed. Fix that too.
Fixes: http://tracker.ceph.com/issues/18975
Signed-off-by: Sage Weil <sage@redhat.com>
2017-02-17 14:50:38 -05:00
Jason Dillaman
f88ed3589d
Merge pull request #13495 from ceph/revert-13452-wip-suite-repo-for-workunit
...
Revert "qa/tasks/workunit: use the suite repo for cloning workunit"
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2017-02-17 13:49:11 -05:00
Kefu Chai
6e285496f1
common/perf_histogram: initialize member vars of axis_config_d
...
addresses CID 1400670: (UNINIT_CTOR)
Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-02-18 02:22:50 +08:00