Commit Graph

40038 Commits

Author SHA1 Message Date
Haomai Wang
ba112d599d librbd: Make image metadata copied during image copy
Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
2015-03-13 22:52:43 +08:00
Haomai Wang
5cae66a950 cls_rbd: Fix incorrect assert for prefix metadata key
Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
2015-03-13 22:52:42 +08:00
Haomai Wang
5178c09dff test_cli: update rbd client help description
Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
2015-03-13 22:52:42 +08:00
Haomai Wang
933702d20c librbd: Add tests for metadata get operation
Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
2015-03-13 22:52:42 +08:00
Haomai Wang
da9a057216 librbd: Add metadata_get method to support single metadata key retrieve
Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
2015-03-13 22:52:42 +08:00
Haomai Wang
dfb3a01485 librbd: Make metadata support clone operation
Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
2015-03-13 22:52:42 +08:00
Haomai Wang
7380632aba rbd.cc: add metadata cli operations
Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
2015-03-13 22:52:42 +08:00
Haomai Wang
e926e902d9 test_librbd: Add librbd interface tests for metadata
Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
2015-03-13 22:51:34 +08:00
Haomai Wang
1260af3d8c test_cls_rbd: add metadata cls tests
Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
2015-03-13 22:51:34 +08:00
Haomai Wang
c983c3cf86 librbd: Add librbd interface impl and tracing for metadata
Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
2015-03-13 22:51:34 +08:00
Haomai Wang
1b2904e206 librbd/internal: Add internal implementation for metatdata ops
Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
2015-03-13 22:51:34 +08:00
Haomai Wang
47d9cecb4b include/librbd: Add metadata interface to librbd
Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
2015-03-13 22:51:34 +08:00
Haomai Wang
ba122b5e66 cls_rbd: Add cls rbd implementation for librbd metadata
Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
2015-03-13 22:51:34 +08:00
Haomai Wang
c1aa3443b8 cls_rbd_client: Add cls rbd client interface to support rbd metadata
Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
2015-03-13 22:51:34 +08:00
Loic Dachary
58e815729a Merge pull request #3986 from Al3xis-N/master
doc: How to generate an object corpus : should be a subsection

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-03-13 15:17:05 +01:00
smagtony@gmail.com
aeca8fb040 doc: How to generate an object corpus : should be a subsection
Fixes: #11099

Signed-off-by: Alexis Normand <n.al3xis@gmail.com>
2015-03-13 15:11:21 +01:00
Loic Dachary
6ba2e49a9b Merge pull request #3987 from RobinDehu/master
doc: extra \ in CEPH\_AUTH\_UNKNOWN

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-03-13 15:09:26 +01:00
dehu robin
38bc2986d8 doc: extra \ in CEPH\_AUTH\_UNKNOWN
Suppress all \

fixes: #11097

Signed-off-by: DEHU Robin <robindehu@gmail.com>
2015-03-13 13:04:14 +01:00
Josh Durgin
6e56438b01 Merge pull request #3979 from ceph/wip-rbd-map-options
rbd: default map options, new options, misc

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2015-03-12 14:36:05 -07:00
Ilya Dryomov
6d9fbbe6f9 rbd: fix rw option skipping logic
We slip in an extraneous comma if { "rw": "rw" } happens to be the
first map_options pair:

    # ./rbd map -o rw,share foo
    /dev/rbd0

    -> 127.0.0.1:6789 name=admin,key=client.admin,,share rbd foo -

The kernel mount options parser can handle it, but fix it nonetheless.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
2015-03-12 14:28:01 +03:00
Ilya Dryomov
2769da40d7 rbd: recognize cephx_require_signatures and tcp_nodelay options
Support for these went into 3.19 and 4.0 kernels respectively.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
2015-03-12 14:27:32 +03:00
Ilya Dryomov
84adff4c74 rbd: add rbd default map options config option
Allow supplying rbd map -o / --options through 'rbd default map
options' config option.  Options specified on the command line take
precedence on a per-option basis, i.e. default and cli options are
merged with a preference for the latter.  For example:

    # grep 'rbd default map options' ceph.conf
            rbd default map options = "ro,nocrc"
    # ./rbd map -o noshare,rw foo
    /dev/rbd0

results in a rw mapping with nocrc,noshare.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
2015-03-12 14:27:32 +03:00
Ilya Dryomov
cd761bb6d3 rbd: drop redefining map option warning
For example:

    # ./rbd map -o share,noshare foo
    rbd: warning: redefining map option share: 'share' -> 'noshare'
    /dev/rbd0

mount(8) doesn't do this and it's a bit silly to begin with.  Drop this
in preparation for adding rbd default map options config option.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
2015-03-12 14:27:32 +03:00
Ilya Dryomov
356a749f63 rbd: regenerate rbd(8) man page
merge-diff and status commands, --image-features and --image-shared
options, other stuff.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
2015-03-12 14:27:32 +03:00
Danny Al-Gaaf
b6d1effee6 Merge pull request #3924 from ktdreyer/wip-doc-rm-old-ceph-deploy-reference
rm old ceph-deploy reference

Reviewed-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2015-03-12 11:11:36 +01:00
Kefu Chai
c0d8089556 Merge pull request #3965 from linuxbox2/xio-fixes
xio: Xio fixes

Reviewed-by: Kefu Chai <kchai@redhat.com>
2015-03-12 17:19:39 +08:00
Matt Benjamin
f5735b28d1 Fix XioLoopbackConnection Lifecycle.
Since XioLoopbackConnection is a RefCountedObject, it can't be
an expanded member of XioMessenger.

Fixes cleanup/shutdown errors.

Signed-off-by: Matt Benjamin <matt@cohortfs.com>
2015-03-11 14:14:28 -04:00
Matt Benjamin
76d4d4c6b7 Fix CMake build w/o RADOSGW.
Just fixes linkage of dencoder in test.  Fix the false assumption
that cls is only used if WITH_RADOSGW.

Signed-off-by: Matt Benjamin <matt@cohortfs.com>
2015-03-11 14:14:20 -04:00
Jason Dillaman
64d9e05d42 Merge pull request #3625 from majianpeng/objectcacher
Bugs fix about ObjectCacher

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2015-03-11 11:53:43 -04:00
Kefu Chai
fdf9e1cd6e Merge pull request #3881 from ceph/wip-da-SCA-20150304
SCA fixes

Reviewed-by: Kefu Chai <kchai@redhat.com>
2015-03-11 23:52:16 +08:00
Danny Al-Gaaf
faa7937f2f tools/rados/rados.cc: init some vars in constructor
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2015-03-11 14:00:08 +01:00
Danny Al-Gaaf
db175fb938 rgw_rados: don't assign value to parameter
Fix for cppcheck issue:
Assignment of function parameter has no effect outside the function.

Remove assignment to need_to_wait before exit.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2015-03-11 14:00:08 +01:00
Danny Al-Gaaf
778e0ef10d src/msg/xio/*: reduce scope of some vars
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2015-03-11 14:00:08 +01:00
Danny Al-Gaaf
6f79e4a616 rgw_quota.cc: init variables in constructor
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2015-03-11 13:58:42 +01:00
Danny Al-Gaaf
16c92378d1 TestErasureCodeShec_thread.cc: reduce scope of var
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2015-03-11 13:58:42 +01:00
Danny Al-Gaaf
ff760bee26 ObjectStoreTransactionBenchmark.cc: reduce scope of var
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2015-03-11 13:58:42 +01:00
Danny Al-Gaaf
828fc737f1 objectstore/store_test.cc: reduce scope of variable
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2015-03-11 13:58:42 +01:00
Danny Al-Gaaf
649f0f3e7e rgw_rados.cc: reduce scope of variable
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2015-03-11 13:58:42 +01:00
Danny Al-Gaaf
0a5e6af484 rgw_rados.cc: remove unused string vars
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2015-03-11 13:58:42 +01:00
Danny Al-Gaaf
e11f9d2c71 librbd/internal.cc: reduce scope of some variables
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2015-03-11 13:58:42 +01:00
Danny Al-Gaaf
0d78f4402f librbd/ObjectMap.cc: reduce scope of variable, prevent redef
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2015-03-11 13:58:42 +01:00
Danny Al-Gaaf
54aa23a699 ErasureCodeShec::minimum_to_decode: reduce scope of variables
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2015-03-11 13:58:42 +01:00
Danny Al-Gaaf
de7bcfd8d0 rgw/rgw_op.cc: fix potential null-deref in strcmp()
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2015-03-11 13:58:41 +01:00
Danny Al-Gaaf
921c08fce5 rgw_main.cc: fix null-deref in case get_storage() fails
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2015-03-11 13:58:41 +01:00
Danny Al-Gaaf
ab4e37f314 mds/MDS.cc: add missing asserts to check return values
Change existing asserts in set_up_admin_socket() to
check (VAR == 0).

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2015-03-11 13:58:41 +01:00
Danny Al-Gaaf
a3d0c80bda TestErasureCodeShec_all.cc: fix sprintf specifier
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2015-03-11 13:58:41 +01:00
Danny Al-Gaaf
51bec737d9 rgw: use static_cast instead of c-style cast
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2015-03-11 13:58:41 +01:00
Danny Al-Gaaf
48d27ba1ed osd/ReplicatedPG.cc: use static_cast instead of c-style cast
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2015-03-11 13:58:41 +01:00
Danny Al-Gaaf
5393f32bbf TestErasureCodeShec_thread.cc: use static_cast instead of c-style
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2015-03-11 13:58:41 +01:00
Danny Al-Gaaf
bfe58833d4 itest/msgr/test_msgr.cc: prefer ++operator for non-primitive iter
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2015-03-11 13:58:41 +01:00