Commit Graph

50214 Commits

Author SHA1 Message Date
Jianpeng Ma
f250f4eac1 osdc/objectCacher: Remove the unsed field.
Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
2016-02-20 14:15:28 +08:00
Jianpeng Ma
ed54420e21 bufferlist: Add new func is_provided_buffer(const char *dst)
Using this function to judge whether copy data from bufferlist to
dst. It mainly used librados C interface to avoid copy data from librados
to caller.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
2016-02-20 14:15:17 +08:00
Josh Durgin
b89ba9986d Merge pull request #7627 from dillaman/wip-librbd-read-replay
librbd: block read requests until journal replayed

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2016-02-19 16:51:07 -08:00
Josh Durgin
ff82fd165a Merge pull request #7718 from dillaman/wip-librbd-mirror-peer
librbd: update of mirror pool mode and mirror peer handling

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2016-02-19 16:50:44 -08:00
Josh Durgin
44d7819cba Merge pull request #7698 from dillaman/wip-librbd-replay-flush
librbd: differentiate journal replay flush vs shut down

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2016-02-19 16:50:19 -08:00
Yehuda Sadeh
c8858019be Merge pull request #7720 from ceph/wip-rgw-aws4
rgw support for aws authentication v4 (Javier M. Mellid)
2016-02-19 16:14:06 -08:00
Yehuda Sadeh
552715995c Merge remote-tracking branch 'jmunhoz/wip-aws4' into wip-aws4
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>

Conflicts:
	src/rgw/rgw_auth_s3.h
	src/rgw/rgw_client_io.cc
	src/rgw/rgw_client_io.h
	src/rgw/rgw_common.h
	src/rgw/rgw_main.cc
	src/rgw/rgw_op.cc
	src/rgw/rgw_op.h
	src/rgw/rgw_rest.cc
	src/rgw/rgw_rest_metadata.cc
	src/rgw/rgw_rest_s3.cc
2016-02-19 14:34:13 -08:00
Yehuda Sadeh
a646103ede Merge pull request #7719 from ceph/wip-rgw-keystone-v3
rgw keystone v3 (Mark Barnes, Radoslaw Zarzynski)

support for keystone v3

Reviewed-by: Matt Benjamin <mbenjamin@redhat.com>
Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2016-02-19 13:42:30 -08:00
Jason Dillaman
700c3dc24b librbd: update mirror peer data structure
Replace cluster uuid with mirror peer uuid and support an
optional pool id within a peer (when using internal APIs
for testing).

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-02-19 16:12:12 -05:00
Jason Dillaman
0ec038abca librbd: support image and pool-level mirroring modes
If pool-level mirroring is enabled, all journaled images within
the pool are eligible for mirroring.  If image-level mirroring
is enabled, mirroring needs to be explicitly enabled on each
image.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-02-19 16:12:12 -05:00
Radoslaw Zarzynski
55cbc60d46 rgw: Keystone token parsing doesn't need to know API version.
This patch targets an issue with S3Extension in Keystone:
requested tokens always conform to Keystone API v2 - regardless
of the version used to make the request.

Previous implementation of KeystoneToken::parse() as well
as KeystoneToken::decode_json() had to know the API version
explicitly. Thus, they might be affected in the future by
changes in S3-compatibility middleware of Keystone.

Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
2016-02-19 12:16:36 -08:00
Radoslaw Zarzynski
abbd91293d rgw: S3 always must use token format of Keystone v2.
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
2016-02-19 12:16:36 -08:00
Radoslaw Zarzynski
2f190fdcb8 rgw: Keystone token parsing should fail on misformed JSONs.
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
2016-02-19 12:16:36 -08:00
Radoslaw Zarzynski
90e1f39469 rgw: improve debugs in RGWPostHTTPData.
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
2016-02-19 12:16:36 -08:00
Radoslaw Zarzynski
bc6d7c304f rgw: ONLY formatting improvements for Keystone-related code.
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
2016-02-19 12:16:36 -08:00
Radoslaw Zarzynski
92764d423a rgw: handle Keystone API version with dedicated enum.
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
2016-02-19 12:16:36 -08:00
Radoslaw Zarzynski
8e90686805 rgw: fix wrong format of admin token request in Keystone v3.
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
2016-02-19 12:16:35 -08:00
Radoslaw Zarzynski
a622e3f9c9 rgw: rework serialization in token retrieval for Keystone's admin.
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
2016-02-19 12:16:35 -08:00
Radoslaw Zarzynski
84bcb50600 rgw: fix Keystone v2 regression in role's JSON parsing
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
2016-02-19 12:16:34 -08:00
Radoslaw Zarzynski
d3299b0fcb rgw: accommodate Keystone v3 in S3-related auth mechanisms.
This patch is based on changes proposed by Mark Barnes
<mark.barnes@ocado.com> (lperiquito) in commit
af71f6a518.

Signed-off-by: Mark Barnes <mark.barnes@ocado.com>
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
2016-02-19 12:16:28 -08:00
Radoslaw Zarzynski
c5b114bba4 rgw: accommodate Keystone v3 in RGWSwift class.
This patch is based on changes proposed by Mark Barnes
<mark.barnes@ocado.com> (lperiquito) in commit
af71f6a518.

Signed-off-by: Mark Barnes <mark.barnes@ocado.com>
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
2016-02-19 12:16:21 -08:00
Radoslaw Zarzynski
38ee66143e rgw: basic data structures for Keystone v3.
The change has been extracted from changeset proposed
in commit af71f6a518 by
Mark Barnes <mark.barnes@ocado.com> (lperiquito).

Signed-off-by: Mark Barnes <mark.barnes@ocado.com>
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
2016-02-19 12:16:15 -08:00
Luis Periquito
46a488137b rgw: unify RGWValidateKeystoneToken with RGWPostHTTPData.
The change has been extracted from changeset proposed
in commit af71f6a518 by
Mark Barnes <mark.barnes@ocado.com> (lperiquito).

Signed-off-by: Mark Barnes <mark.barnes@ocado.com>
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
2016-02-19 12:16:15 -08:00
Radoslaw Zarzynski
a868e598bc rgw: make RGWPostHTTPData able to extract X-Subject-Token.
The change has been extracted from changeset proposed
in commit af71f6a518 by
Mark Barnes <mark.barnes@ocado.com> (lperiquito).

Signed-off-by: Mark Barnes <mark.barnes@ocado.com>
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
2016-02-19 12:16:05 -08:00
Kefu Chai
694f92f342 PendingReleaseNotes: document the dropped buffer symbols
the symbols of buffer::list::iterator_impl<> were wrongly exposed
in previous infernalis release, and the clients linked against
librados are very likely using them. so we need to document this
change.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-02-20 01:15:01 +08:00
Kefu Chai
6c645780dd buffer: hide iterator_impl symbols
buffer::list::iterator_impl symbols are referenced by const_iterator
and iterator, and are exposed as weak symbols. if a source file is
compiled using the buffer.h, the produced object file will reference
these symbols as well, so we'd better hiding them and avoid using
them in the header file.
as a side-effect, buffer::list::const_iterator is also hidden, but
currently we don't have any librados client using this class, so
we can just leave it as an internal class at this moment.

Fixes: #14788
Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-02-20 01:15:01 +08:00
Jason Dillaman
7249a5cf70 librbd: read ops require journal replay
When journaling is enabled, a read op should acquire the exclusive
lock and replay the journal in case uncommitted writes are stored
in the journal.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-02-19 11:34:22 -05:00
Orit Wasserman
6582b7d509 Merge pull request #7717 from cbodley/wip-cmake-rbd-image-watcher
cmake: add missing librbd image_watcher sources

Reviewed-by: Orit Wasserman <owasserm@redhat.com>
2016-02-19 17:33:47 +01:00
Casey Bodley
b61f467651 cmake: add missing librbd image_watcher sources
Fixes: #14823

Signed-off-by: Casey Bodley <cbodley@redhat.com>
2016-02-19 11:18:32 -05:00
Yehuda Sadeh
0f45d58903 Merge pull request #7709 from ceph/wip-rgw-new-multisite-merge
rgw multisite v2 (Yehuda Sadeh, Orit Wasserman, Casey Bodley)
 - rename region to zonegroup
 - new zone and zonegroup configuration
 - new realm and period structures
 - rgw handles synchronization (no need for sync agent)
 - active-active data

Signed-off-by: Yehuda Sadeh
2016-02-19 07:22:03 -08:00
Nathan Cutler
882066d6b7 doc: standardize @param (not @parma, @parmam, @params)
Signed-off-by: Nathan Cutler <ncutler@suse.com>
2016-02-19 15:32:14 +01:00
Danny Al-Gaaf
4213b869f6 msg/xio/XioConnection.h: init some member variables in ctor
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2016-02-19 12:51:11 +01:00
Danny Al-Gaaf
a55f8c2186 librbd/operation/RebuildObjectMapRequest.cc: init m_snap_list_ret in ctor
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2016-02-19 12:51:11 +01:00
Danny Al-Gaaf
c645bd9c09 librbd/DiffIterate.cc: reduce scope of variable
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2016-02-19 12:51:11 +01:00
Danny Al-Gaaf
1f0c1b1a7e librbd/ImageCtx.cc: reduce scope of variable
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2016-02-19 12:51:11 +01:00
Danny Al-Gaaf
e6d3a0f9b4 msg/async/EventKqueue.cc: reduce scope of variable
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2016-02-19 12:51:11 +01:00
Danny Al-Gaaf
e5c9694aa5 msg/async/Event.cc: reduce scope of variable
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2016-02-19 12:51:11 +01:00
Danny Al-Gaaf
a37ae6a3e3 log/Graylog.h: make ctor explicit
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2016-02-19 12:51:11 +01:00
Danny Al-Gaaf
60b61b450a librbd/AioImageRequest.cc: reduce scope of var
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2016-02-19 12:51:11 +01:00
Danny Al-Gaaf
c51ada3b38 ErasureCodeJerasure.h: init packetsize member var in ctor
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2016-02-19 12:51:11 +01:00
Danny Al-Gaaf
00af2a2783 compressor/zlib/CompressionPluginZlib.cc: use explicit for ctor
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2016-02-19 12:51:11 +01:00
Danny Al-Gaaf
6169854519 compressor/zlib/CompressionZlib.cc: reduce scope of variable
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2016-02-19 12:51:11 +01:00
Danny Al-Gaaf
91a8b1b2b1 journal/JournalMetadata.cc: compare size of lhs instead of rhs to rhs
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2016-02-19 12:51:11 +01:00
Danny Al-Gaaf
d71df26198 test_Replay.cc: prefer ++operator for non-primitive iterators
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2016-02-19 12:51:11 +01:00
Danny Al-Gaaf
11bfc6dfc5 common/PluginRegistry.h: init Plugin::library in ctor
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2016-02-19 12:50:35 +01:00
Danny Al-Gaaf
b906041aff common/Graylog.h: make constructor explicit
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2016-02-19 12:50:35 +01:00
Danny Al-Gaaf
44e028f9d5 HTMLFormatter: reuse m_header_done from parent class
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2016-02-19 12:50:35 +01:00
Danny Al-Gaaf
fc44347428 cls/rbd/cls_rbd.cc: reuse existing variable with same name
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2016-02-19 12:50:35 +01:00
Danny Al-Gaaf
8793921ce2 mds/Server.cc: replace inefficient string::find() w/ compare()
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2016-02-19 12:50:35 +01:00
Danny Al-Gaaf
729117f90e client/SyntheticClient.cc: reduce scope of some variables
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2016-02-19 12:50:35 +01:00