Commit Graph

49958 Commits

Author SHA1 Message Date
xie xingguo
73d86b36ef BlueStore: simplify cow allocation for head and tail a little
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-02-23 09:26:14 +08:00
xie xingguo
d01a39e212 BlueStore: optimize head check logic
For the sake of performance.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-02-23 09:26:14 +08:00
xie xingguo
26db0588b0 BlueStore: simplify put logic a little
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-02-23 09:26:14 +08:00
xie xingguo
4b673ee263 KStore: fix return type of _txc_add_transaction
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-02-23 09:26:13 +08:00
xie xingguo
73f35f114b BlueStore: fix return type of _txc_add_transaction
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-02-23 09:26:13 +08:00
xie xingguo
00d40e2467 BlueStore: avoid create the dest onode in advance
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-02-23 09:26:13 +08:00
xie xingguo
5e55c13323 BlueStore: remove unused member dirty of onode
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-02-23 09:26:13 +08:00
Kefu Chai
847c3eba41 Merge pull request #7647 from yuyuyu101/wip-spdk
NVMEDevice: refactor probe/attach codes and support zero command

Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-02-21 19:30:25 +08:00
Haomai Wang
4c0f6a3b9a NVMEDevice: accept spdk api name changes
Signed-off-by: Haomai Wang <haomai@xsky.com>
2016-02-21 18:43:02 +08:00
Haomai Wang
4602f1ba8a spdk: update spdk submodule to accept new interface changes
Signed-off-by: Haomai Wang <haomai@xsky.com>
2016-02-21 18:38:11 +08:00
Haomai Wang
feaa457336 NVMEDevice: add default constructor for Task and clean up
Signed-off-by: Haomai Wang <haomai@xsky.com>
2016-02-21 18:33:24 +08:00
Haomai Wang
7ef2f4aab3 NVMEDevice: only activate zero command when backend supported
Signed-off-by: Haomai Wang <haomai@xsky.com>
2016-02-21 18:30:55 +08:00
Haomai Wang
b5cdc33250 BlockDevice: detect symbol file basename
Signed-off-by: Haomai Wang <haomai@xsky.com>
2016-02-21 18:27:10 +08:00
Haomai Wang
d208668d57 BlueStore: fix spdk link file create failed
Signed-off-by: Haomai Wang <haomai@xsky.com>
2016-02-21 18:23:54 +08:00
Haomai Wang
84a36a0a29 NVMEDevice: fix atomic and lock changes
Signed-off-by: Haomai Wang <haomai@xsky.com>
2016-02-21 18:23:46 +08:00
Haomai Wang
4f868ee49e NVMEDevice: use nvme_probe to simply init
Signed-off-by: Haomai Wang <haomai@xsky.com>
2016-02-21 18:22:12 +08:00
Haomai Wang
61ef7d4ea0 spdk: update spdk submodule
Signed-off-by: Haomai Wang <haomai@xsky.com>
2016-02-21 18:18:52 +08:00
Haomai Wang
525927044b NVMEDevice: use nvme zero command instead of writing zero
Signed-off-by: Haomai Wang <haomai@xsky.com>
2016-02-21 18:18:37 +08:00
Haomai Wang
398e331ea9 NVMEDevice: cleanup task iterator process
Signed-off-by: Haomai Wang <haomai@xsky.com>
2016-02-21 18:16:18 +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
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
Kefu Chai
f6692a42df Merge pull request #7371 from theanalyst/mon/quota-msg-cleanup
mon: cleanup set-quota error msg

Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-02-19 17:56:20 +08:00
Josh Durgin
49a7ef5001 Merge pull request #7708 from jdurgin/wip-cython-cleanup
pybind: replace __del__ with __dealloc__ for rbd

Reviewed-by: Hector Martin <marcan@marcan.st>
Reviewed-by: Mehdi Abaakouk <sileht@sileht.net>
2016-02-19 00:34:50 -08:00
Abhishek Lekshmanan
a917ccfce5 mon: cleanup set-quota error msg
When we send in an unrecognized field for set-quota, specify that the
options should be `max_bytes` or `max_objects`. This doesn't affect the
ceph-cli as the choices are caught at an earlier stage, however the
error message is seen while reaching the cluster via rados api for eg.

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
2016-02-19 09:29:04 +01:00
Josh Durgin
b556b24a31 Merge pull request #7668 from dillaman/wip-librbd-replay-locks
librbd: use async librados notifications

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2016-02-19 00:15:36 -08:00
Yehuda Sadeh
9695a0b4d1 rgw: avoid empty object names
Don't try to sync an object with empty name (shouldn't happen, but
bugs may happen). Also, don't try to write_meta() of an empty object
name, in case we get there through a different path somehow.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
2016-02-18 23:50:06 -08:00