Commit Graph

59519 Commits

Author SHA1 Message Date
Jason Dillaman
0d81674eee librbd: ensure consistency groups will gracefully fail on older OSDs
Attempting to retrieve the group spec will fail on older OSDs, so it
must be executed as an individual step in the refresh state machine.
Also fixed code style issues for out parameters.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-10-24 11:56:48 -04:00
Jason Dillaman
e7da810e75 Merge pull request #11160 from VictorDenisov/consistency_groups_namespaces
librbd: add support for snapshot namespaces

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2016-10-24 11:55:48 -04:00
Jayashree Candadai
db917d50eb ceph-disk: allow using a regular file as a journal
Because of a missing return, ceph-disk prepare would fail if given a
regular file as a journal. If the journal file does not exist, ceph-disk
will create it but fail to ensure that the ceph user owns it. The
symlink to the journal file is not set when the journal file is
specified on the command line and the journal file does not exist at
all. The ceph-osd daemon will silently create it as a file but it will
not be the file given in argument.

Add a test case to verify using a regular file as a journal works as
expected.

Fixes: http://tracker.ceph.com/issues/17662

Signed-off-by: Jayashree Candadai <jayaajay@indiana.edu>
Signed-off-by: Loic Dachary <ldachary@redhat.com>
2016-10-24 15:58:31 +02:00
John Spray
439ca801b3 mds: fix compile error from merges
Two patches both added these definitions
in slightly different places, so git let them
merge without a conflict.

Signed-off-by: John Spray <john.spray@redhat.com>
2016-10-24 13:36:32 +01:00
John Spray
4f09892a84 Merge remote-tracking branch 'ukernel/wip-mdstypes-split' 2016-10-24 12:02:48 +01:00
John Spray
ba5d61d954 Merge pull request #11576 from ukernel/wip-17636-debug
mds: add debug assertion for issue #17636

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2016-10-24 12:00:48 +01:00
John Spray
7001eeef45 Merge pull request #11578 from jcsp/wip-backtrace-repair
mds: repair backtraces during scrub

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2016-10-24 11:53:47 +01:00
Sage Weil
9e0b482a8e Merge pull request #11596 from liewegas/wip-osdmap-features
mon/OSDMonitor: encode OSDMap::Incremental with same features as OSDMap

Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-10-24 05:28:44 -05:00
Sage Weil
3b35f2d010 unittest_bluestore_types: fix csum const name
Signed-off-by: Sage Weil <sage@redhat.com>
2016-10-24 04:57:42 -05:00
Sage Weil
cc306c81d2 Merge branch 'wip-bluestore-per-pool-compress2' of https://github.com/ifed01/ceph 2016-10-24 04:57:34 -05:00
Yan, Zheng
9e3471cc5e tools/cephfs: add 'scan_links' command which fixes linkages errors
Signed-off-by: Yan, Zheng <zyan@redhat.com>
2016-10-24 16:31:50 +08:00
Kefu Chai
75edfbba34 Merge pull request #8751 from flyd1005/wip-fix-typo
doc: fix typos

Reviewed-by: Abhishek Lekshmanan <abhishek@suse.com>
2016-10-24 11:15:12 +08:00
runsisi
45fc387e16 auth: fix NULL pointer access when trying to delete CryptoAESKeyHandler instance
the caller needs to check the nullity of the parameter before calling
PK11_FreeSymKey or PK11_FreeSlot, otherwise if CryptoAESKeyHandler::init
failed, we will hit a segfault as follows:
  #0  0x00007f76844f5a95 in PK11_FreeSymKey () from /lib64/libnss3.so
  #1  0x00007f76586b6e49 in CryptoAESKeyHandler::~CryptoAESKeyHandler() () from /lib64/librados.so.2
  #2  0x00007f76586b5eea in CryptoAES::get_key_handler(ceph::buffer::ptr const&, std::string&) () from /lib64/librados.so.2
  #3  0x00007f76586b4b9c in CryptoKey::_set_secret(int, ceph::buffer::ptr const&) () from /lib64/librados.so.2
  #4  0x00007f76586b4e95 in CryptoKey::decode(ceph::buffer::list::iterator&) () from /lib64/librados.so.2
  #5  0x00007f76586b7ee6 in KeyRing::set_modifier(char const*, char const*, EntityName&, std::map<std::string, ceph::buffer::list, std::less<std::string>, std::allocator<std::pair<std::string const, ceph::buffer::list> > >&) () from /lib64/librados.so.2
  #6  0x00007f76586b8882 in KeyRing::decode_plaintext(ceph::buffer::list::iterator&) () from /lib64/librados.so.2
  #7  0x00007f76586b9803 in KeyRing::decode(ceph::buffer::list::iterator&) () from /lib64/librados.so.2
  #8  0x00007f76586b9a1f in KeyRing::load(CephContext*, std::string const&) () from /lib64/librados.so.2
  #9  0x00007f76586ba04b in KeyRing::from_ceph_context(CephContext*) () from /lib64/librados.so.2
  #10 0x00007f765852d0cd in MonClient::init() () from /lib64/librados.so.2
  #11 0x00007f76583c15f5 in librados::RadosClient::connect() () from /lib64/librados.so.2
  #12 0x00007f765838cb1c in rados_connect () from /lib64/librados.so.2
  ...

Signed-off-by: runsisi <runsisi@zte.com.cn>
2016-10-24 09:24:51 +08:00
Loic Dachary
0e5e33dae0 Merge pull request #10955 from objoo/YD-mailmap-updates-Sept
mailmap updates sept

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2016-10-23 23:32:34 +02:00
Michal Jarzabek
7a90d18b7f mds/CDir.cc: remove unneeded use of count
Signed-off-by: Michal Jarzabek <stiopa@gmail.com>
2016-10-23 15:00:54 +01:00
Patrick Donnelly
99a21133cd
mds: check if down mds is known
This avoids an assertion failure where an MDS receives an mdsmap that
causes it to enter up:replay and also see another MDS go down.

Fixes: http://tracker.ceph.com/issues/17670

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
2016-10-22 18:47:03 -04:00
Michal Jarzabek
e710e5ade7 mds/SnapRealm: remove unneeded use of count
Signed-off-by: Michal Jarzabek <stiopa@gmail.com>
2016-10-22 17:27:58 +01:00
Sage Weil
3eec78e5f1 Merge pull request #11607 from xiexingguo/xxg-wip-bluestore-1022
os/bluestore: simplify can_split_at() 

Reviewed-by: Sage Weil <sage@redhat.com>
2016-10-22 09:54:54 -05:00
xie xingguo
1958ca7426 os/bluestore: literal changes
1. drop redundant semicolon
2. fix wrong output message

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-10-22 17:25:36 +08:00
huanwen ren
1d6a3e44ec test/libcephfs: add ceph_fsetattr() test
Signed-off-by: huanwen ren <ren.huanwen@zte.com.cn>
2016-10-22 12:15:54 +08:00
Victor Denisov
dfc63168ac cls_rbd: Allow snapshots with the same name in different namespaces
Signed-off-by: Victor Denisov <denisovenator@gmail.com>
2016-10-21 20:53:24 -07:00
Victor Denisov
6788d9305e rbd: Use user snapshot namespace in rbd_mirror for now
Signed-off-by: Victor Denisov <denisovenator@gmail.com>
2016-10-21 20:53:24 -07:00
Victor Denisov
2174751946 librbd: By default create snapshots in UserNamespace
Signed-off-by: Victor Denisov <denisovenator@gmail.com>
2016-10-21 20:53:24 -07:00
Victor Denisov
ca31b7a744 cls_rbd: Add snapshot namespaces data structures
Signed-off-by: Victor Denisov <denisovenator@gmail.com>
2016-10-21 20:53:24 -07:00
xie xingguo
5c91f71e6c os/bluestore: simplify can_split_at()
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-10-22 10:33:20 +08:00
Gregory Farnum
3e9064cedb Merge pull request #11026 from jcsp/wip-pg-files
tools/cephfs: add pg_files command

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2016-10-21 14:48:31 -07:00
Gregory Farnum
e677f0c243 Merge pull request #11456 from tchaikov/wip-17558
mon: send updated monmap to its subscribers

Reviewed-by: Joao Eduardo Luis <joao@suse.de>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2016-10-21 14:40:46 -07:00
Michal Jarzabek
333a07e8a9 mds/InoTable.h: add override to virtual functs
Signed-off-by: Michal Jarzabek <stiopa@gmail.com>
2016-10-21 22:32:15 +01:00
Radoslaw Zarzynski
46a44646e8 rgw: make the ASIO front-end compilation optional.
This is because of versioning issues between Boost and Beast
on CentOS 7. It is intended that this patch will be reverted
after merging the in-tree Boost facility.

Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
2016-10-21 22:57:23 +02:00
Radoslaw Zarzynski
3a9f50c55e rgw: fix interface compliance of RGWCivetWeb::write_data().
This is a potential fix for partial writes and handling of error
codes that might come from mg_write() of the CivetWeb front-end.
None of the potential issues has been observed in testing.

The commit also documents the same aspects regarding the ASIO
and FastCGI front-ends.

Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
2016-10-21 22:57:22 +02:00
Radoslaw Zarzynski
b3bbe206b7 rgw: document interfaces of the rgw::io namespace.
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
2016-10-21 22:57:22 +02:00
Radoslaw Zarzynski
d1c82762b6 rgw: don't use boost::string_ref::to_string() method.
The method has been introduced in Boost 1.54. However,
some systems we are targeting (like CentOS 7) offer
older version of the library.

Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
2016-10-21 22:57:22 +02:00
Radoslaw Zarzynski
5da12f60d6 rgw: ONLY move rgw_client_io_decoimpl.h to rgw_client_io_filters.h.
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
2016-10-21 22:57:22 +02:00
Radoslaw Zarzynski
a33462f806 rgw: protect the {ACCOUNTING,AWS_AUTHv4,RESTFUL}_IO casts with assert.
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
2016-10-21 22:57:22 +02:00
Radoslaw Zarzynski
abccedc3bf rgw: add support for dispatching requests with respect to frontend prefix.
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
2016-10-21 22:57:22 +02:00
Radoslaw Zarzynski
8b03f8773b rgw: fix perfect forwarding of template arguments in IO filters.
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
2016-10-21 22:57:22 +02:00
Radoslaw Zarzynski
3e1a90d535 rgw: switch to size_t and exception in rgw::io::BasicClient::complete_request.
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
2016-10-21 22:57:22 +02:00
Radoslaw Zarzynski
908c073206 rgw: introduce AWS_AUTHv4_IO.
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
2016-10-21 22:57:22 +02:00
Radoslaw Zarzynski
758b251bc6 rgw: use filters over AsioConnection.
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
2016-10-21 22:57:22 +02:00
Radoslaw Zarzynski
d69a1f68bc rgw: employ necessary filter over RGWFCGX frontend.
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
2016-10-21 22:57:22 +02:00
Radoslaw Zarzynski
27338a08b0 rgw: improve debugs in RGWAsioClientIO and AsioConnection.
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
2016-10-21 22:57:21 +02:00
Radoslaw Zarzynski
8c32686008 rgw: fix setting HTTP/0.0 in AsioConnection::write_bad_request.
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
2016-10-21 22:57:21 +02:00
Radoslaw Zarzynski
9f1713c9d4 rgw: fix off-by-one in RGWAsioClientIO::init_env.
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
2016-10-21 22:57:21 +02:00
Radoslaw Zarzynski
79923f4ddd rgw: switch to namespaces and change naming in the frontend subsystem.
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
2016-10-21 22:57:21 +02:00
Radoslaw Zarzynski
f0285577d7 rgw: ONLY replace std::size_t with size_t.
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
2016-10-21 22:57:21 +02:00
Radoslaw Zarzynski
dad4d16a22 rgw: make RGWRestfulIOEngine::Exception alias to std::system_error.
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
2016-10-21 22:57:21 +02:00
Radoslaw Zarzynski
e524c586fd rgw: rename and split STREAM_IO into RESTFUL_IO and ACCOUNTING_IO.
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
2016-10-21 22:57:21 +02:00
Radoslaw Zarzynski
6db8699f26 rgw: delegate transfer accounting to RGWRestfulIOAccountingEngine.
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
2016-10-21 22:57:21 +02:00
Radoslaw Zarzynski
8bb27bccdf rgw: change naming based on RGWStreamIO in favor of RGWRestfulIO.
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
2016-10-21 22:57:21 +02:00
Radoslaw Zarzynski
16c2586083 rgw: remove the legacy, non-throwing variant of RGWStreamIO.
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
2016-10-21 22:57:21 +02:00