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,891 Commits 211 Branches 394 Tags 1.4 GiB
84bcb50600
Commit Graph

49891 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Josh Durgin
3d391546f5 .gitignore: include recently added rgw programs 
Signed-off-by: Josh Durgin <jdurgin@redhat.com>
 2016-02-18 23:49:09 -08:00
Yehuda Sadeh
3f525f4043 rgw: fix s3 list bucket (affects format=json) 
another merge casualty. The section wasn't opened properly.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
 2016-02-18 23:49:00 -08:00
Josh Durgin
0a988f95bc pybind: replace __del__ with __dealloc__ for rbd 
Cython extension types like these don't call __del__, but use
__dealloc__ instead:

http://docs.cython.org/src/userguide/special_methods.html#finalization-method-dealloc

Signed-off-by: Josh Durgin <jdurgin@redhat.com>
 2016-02-18 23:47:24 -08:00
Josh Durgin
5489ad3a21 Merge pull request #7706 from sileht/sileht/rados-cython 
pybind: remove next() on iterators

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
 2016-02-18 23:46:21 -08:00
Yehuda Sadeh
1e47268557 rgw: only validate bucket name if not empty 
This got broken due to code movement

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
 2016-02-18 23:09:48 -08:00
Yehuda Sadeh
804e6c8f94 rgw: resurrect lost code 
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
 2016-02-18 23:07:07 -08:00
Mehdi Abaakouk
f98b4855e4 pybind: remove next() on iterator 
Cython recommends to implement only __next__() methods.

http://docs.cython.org/src/userguide/special_methods.html#the-next-method

Signed-off-by: Mehdi Abaakouk <sileht@redhat.com>
 2016-02-19 07:59:08 +01:00
Loic Dachary
78b3c40cbc Merge pull request #7641 from batrick/vstart-usage 
Clarify usage on starting single osd/mds/mon.

Reviewed-by: Loic Dachary <ldachary@redhat.com>
 2016-02-19 13:25:46 +07:00
Yehuda Sadeh
72b0333017 test/Makefile-client.am: adjustment following merge 
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
 2016-02-18 20:49:35 -08:00
Josh Durgin
398c493fa9 Merge pull request #7692 from sileht/sileht/rados-cython 
pybind/rados: use __dealloc__ since __del__ is ignored by cython

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
 2016-02-18 17:42:26 -08:00
Yehuda Sadeh
4d494d5b05 Merge remote-tracking branch 'origin/master' into wip-rgw-new-multisite 
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>

Conflicts:
	src/CMakeLists.txt
	src/rgw/Makefile.am
	src/rgw/rgw_admin.cc
	src/rgw/rgw_common.h
	src/rgw/rgw_main.cc
	src/rgw/rgw_op.cc
	src/rgw/rgw_rados.h
	src/rgw/rgw_rest_s3.cc
	src/test/Makefile-client.am
 2016-02-18 17:14:07 -08:00
Yehuda Sadeh
ac168e3f00 rgw: add drain_all() before exiting a cr 
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
 2016-02-18 15:25:52 -08:00
Yehuda Sadeh
d95fcfa544 rgw: silence compilation #warnings 
these are now FIXMEs

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
 2016-02-18 15:20:20 -08:00
Yehuda Sadeh
996e6e9a8a rgw: more error reporting 
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
 2016-02-18 15:18:08 -08:00
Yehuda Sadeh
ac726c6dd4 rgw: data sync error handling (for sync init) 
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
 2016-02-18 15:18:03 -08:00
Yehuda Sadeh
d2d0f8471e rgw: a bit better hashing 
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
 2016-02-18 15:11:00 -08:00
Jason Dillaman
4f15332db3 librbd: don't hold owner lock while refreshing image synchronously 
The write lock will be taken when the new state is applied.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
 2016-02-18 17:58:28 -05:00
Jason Dillaman
4ecdf066fd librbd: need owner write lock when disabling exclusive lock 
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
 2016-02-18 17:56:20 -05:00
Jason Dillaman
922072aeb5 librbd: correct memory leaks discovered via valgrind 
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
 2016-02-18 17:46:35 -05:00
Jason Dillaman
7e09cb132b librbd: notifications should be flushed between exclusive lock states 
Avoid leaving in-flight notification messages when transitioning lock
states.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
 2016-02-18 17:46:34 -05:00
Casey Bodley
eebe61a579 rgw: RGWMetaSyncCR loops through period history 
RGWMetaSyncCR uses a period history Cursor to track its position. it
uses this to get the max sync markers for each shard from the following
period, so that RGWMetaSyncShardCR knows when to stop syncing and return
control to RGWMetaSyncCR

Signed-off-by: Casey Bodley <cbodley@redhat.com>
 2016-02-18 14:04:21 -08:00
Casey Bodley
6b6625e28c rgw: get period history cursor when starting sync 
Signed-off-by: Casey Bodley <cbodley@redhat.com>
 2016-02-18 14:04:21 -08:00
Casey Bodley
12cae9e702 rgw: remove RGWMetadataManager::store_md_log_entries 
Signed-off-by: Casey Bodley <cbodley@redhat.com>
 2016-02-18 14:04:20 -08:00
Casey Bodley
be5c263fa4 rgw: rados coroutines take bucket by const ref 
Signed-off-by: Casey Bodley <cbodley@redhat.com>
 2016-02-18 14:04:20 -08:00
Casey Bodley
f10a6d4f92 rgw: add first log period to mdlog info response 
Signed-off-by: Casey Bodley <cbodley@redhat.com>
 2016-02-18 14:04:20 -08:00
Casey Bodley
988133019a rgw: factor get_log_shard_id() out of RGWMetadataLog 
by using RGWRados::key_to_shard_id(), we can avoid the dependency on
RGWMetadataLog's prefix (and period)

Signed-off-by: Casey Bodley <cbodley@redhat.com>
 2016-02-18 14:04:20 -08:00
Casey Bodley
adab1e1859 rgw: add period id to rgw_rest_log operations 
Signed-off-by: Casey Bodley <cbodley@redhat.com>
 2016-02-18 14:04:20 -08:00
Casey Bodley
02edcdd905 rgw-admin: update callers of get_log 
Signed-off-by: Casey Bodley <cbodley@redhat.com>
 2016-02-18 14:04:20 -08:00
Casey Bodley
34ea6bcc85 rgw: add map of period_id -> RGWMetadataLog 
Signed-off-by: Casey Bodley <cbodley@redhat.com>
 2016-02-18 14:04:20 -08:00
Casey Bodley
5b12ec0b7d rgw: add period id to metadata log oids 
Signed-off-by: Casey Bodley <cbodley@redhat.com>
 2016-02-18 14:04:19 -08:00
Casey Bodley
699809e1fd rgw: RGWRemoteMetaLog passes period id with requests to master 
Signed-off-by: Casey Bodley <cbodley@redhat.com>
 2016-02-18 14:04:19 -08:00
Casey Bodley
25771efa94 rgw: move sync_status into RGWRemoteMetaLog 
Signed-off-by: Casey Bodley <cbodley@redhat.com>
 2016-02-18 14:04:19 -08:00
Casey Bodley
3c990d22f2 rgw: include period id in rgw_meta_sync_info 
Signed-off-by: Casey Bodley <cbodley@redhat.com>
 2016-02-18 14:04:19 -08:00
Casey Bodley
ea9f0fc374 rgw: use std::move for strings in RGWFetchAllMetaCR 
Signed-off-by: Casey Bodley <cbodley@redhat.com>
 2016-02-18 14:04:19 -08:00
Casey Bodley
fe681503a9 cmake: remove duplicate rgw source files 
Signed-off-by: Casey Bodley <cbodley@redhat.com>
 2016-02-18 14:04:19 -08:00
Casey Bodley
1ebb55b286 rgw: remove RemoteMetaLog::fetch() and admin command 
Signed-off-by: Casey Bodley <cbodley@redhat.com>
 2016-02-18 14:04:19 -08:00