RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-27 14:03:25 +00:00
Code Issues Packages Projects Releases Wiki Activity
49,979 Commits 211 Branches 394 Tags 1.4 GiB
79dcef2794
Commit Graph

49979 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mykola Golub
79dcef2794 librbd: add field to MirrorPeerClientMeta to store snap name 
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
 2016-02-23 09:25:31 +02:00
Mykola Golub
e92b45278c rbd-mirror: ImageReplayer: pass registered client ID as external param 
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
 2016-02-23 09:25:20 +02:00
Loic Dachary
4bb184f1e3 Merge pull request #7687 from yangdongsheng/ceph-disk_nargs 
ceph-disk: make some arguments as required if necessary

Reviewed-by: Loic Dachary <ldachary@redhat.com>
 2016-02-23 12:08:46 +07:00
Sage Weil
e9a4cd13ad Merge pull request #7640 from batrick/vstart-btrfs-missing 
vstart.sh: silence a harmless msg where btrfs is not found

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2016-02-22 21:59:28 -05:00
Jason Dillaman
89764124b3 Merge pull request #7737 from trociny/wip-librados_test_stub-debug 
test: more debug logging for TestWatchNotify

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
 2016-02-22 12:37:33 -05:00
Sage Weil
b9a4b977a3 Merge pull request #7714 from SUSE/wip-qa-typo 
doc: standardize @param (not @parma, @parmam, @params)

Reviewed-by: Abhishek Lekshmanan <abhishek@suse.com>
 2016-02-22 12:36:42 -05:00
Jason Dillaman
289403df3c Merge pull request #7738 from trociny/test-librbd-poolname 
test: create pools for rbd tests with different prefix

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
 2016-02-22 12:36:01 -05:00
Sage Weil
dd478ffeff Merge pull request #7727 from jmunhoz/ceph-fix-14829 
vstart.sh: avoid race condition starting rgw via vstart.sh

Reviewed-by: Sage Weil <sage@redhat.com>
 2016-02-22 12:29:47 -05:00
Jason Dillaman
93f255c988 Merge pull request #7614 from trociny/wip-rbd-mirroring-image-reply 
rbd-mirror: implement ImageReplayer

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
 2016-02-22 11:47:49 -05:00
Loic Dachary
ebc7a92f18 Merge pull request #7744 from dachary/wip-14838-ceph-disk-dmcrypt 
ceph-disk: s/dmcrpyt/dmcrypt/

Reviewed-by: Nathan Cutler <ncutler@suse.com>
 2016-02-22 23:07:35 +07:00
Loic Dachary
ef6aafa854 ceph-disk: s/dmcrpyt/dmcrypt/ 
http://tracker.ceph.com/issues/14838 Fixes: #14838

Signed-off-by: Frode Sandholtbraaten <fsa@basefarm.no>
Signed-off-by: Loic Dachary <loic@dachary.org>
 2016-02-22 23:02:46 +07:00
Kefu Chai
838b367529 Merge pull request #7688 from tchaikov/wip-14788 
buffer: hide iterator_impl symbols

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
 2016-02-22 22:42:41 +08:00
Mykola Golub
83da093637 test: create pools for rbd tests with different prefix 
This makes easier to find out what test fails to cleanup.

Signed-off-by: Mykola Golub <mgolub@mirantis.com>
 2016-02-22 09:37:36 +02:00
Loic Dachary
b8131f893a Merge pull request #7723 from tchaikov/wip-rgw-test 
test/radosgw-admin: update the expected usage outputs

Reviewed-by: Loic Dachary <ldachary@redhat.com>
 2016-02-22 12:44:14 +07: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
Mykola Golub
8d27e99b0a test: more debug for TestWatchNotify 
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
 2016-02-21 13:10:52 +02: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
Javier M. Mellid
809189b4c8 vstart.sh: avoid race condition starting rgw via vstart.sh 
In slow environments running vstart.sh hits a race condition setting up
the rgw server. Creating the S3 and Swift users before booting rgw
avoids the issue.

Fixes: #14829

Signed-off-by: Javier M. Mellid <jmunhoz@igalia.com>
 2016-02-20 17:33:21 +00:00
Kefu Chai
cf8483f906 test/radosgw-admin: update the expected usage outputs 
to match with the latest radosgw-admin changes.

Signed-off-by: Kefu Chai <kchai@redhat.com>
 2016-02-20 16:58:16 +08:00
Mykola Golub
cc4b73b3f5 test: rbd-mirror: add tool to test ImageReplayer 
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
 2016-02-20 10:05:13 +02:00
Mykola Golub
f829186726 test: rbd-mirror: add ImageReplayer tests 
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
 2016-02-20 10:05:13 +02:00
Mykola Golub
b3990a153a rbd-mirror: implement ImageReplayer 
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
 2016-02-20 10:05:13 +02:00
Mykola Golub
886e28abee journal: wrappers to get journal metadata 
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
 2016-02-20 08:19:16 +02:00
Mykola Golub
0aaaf3676c librbd: allow to use journal replay externally 
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
 2016-02-20 08:19:16 +02:00
Mykola Golub
9e1cf70ee8 cls::journal: don't print client data 
It makes `rbd journal status` output look ugly.

It is a temporary solution and is going to be improved in
the future (it could be useful to see data but decoded).

Signed-off-by: Mykola Golub <mgolub@mirantis.com>
 2016-02-20 08:19:16 +02: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