Commit Graph

71402 Commits

Author SHA1 Message Date
huanwen ren
09f32b1ff7 mgr: mkdir bootstrap-mgr
ceph-deploy rely on bootstrap-mgr 
as follows: https://github.com/ceph/ceph-deploy/blob/master/ceph_deploy/mgr.py#L37

Signed-off-by: huanwen ren <ren.huanwen@zte.com.cn>
2017-04-27 16:21:02 +08:00
Kefu Chai
bdcc25b888 Merge pull request #14779 from smithfarm/wip-fix-arch-build
build/ops: rpm: package crypto on x86_64 only

Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-04-27 11:14:00 +08:00
Radoslaw Zarzynski
362c106c2c Merge pull request #14499 from mdw-at-linuxbox/wip-rgw-acl
rgw: swift: ability to update swift read and write acls separately.

Reviewed-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
2017-04-26 23:30:35 +02:00
Casey Bodley
577cca0e51 Merge pull request #14714 from cbodley/wip-19446
rgw: dont spawn error_repo until lease is acquired

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2017-04-26 14:30:20 -04:00
Sage Weil
415dcb438a Merge pull request #12720 from kylinstorage/wip-loop-invariant-code-motion
osd/PG.cc: loop invariant code motion

Reviewed-by: Sage Weil <sage@redhat.com>
2017-04-26 13:04:12 -05:00
Kefu Chai
a81863e7b8 Merge pull request #13053 from Ted-Chang/kstore-bloom-filter
os/kstore: Added rocksdb bloom filter settings

Reviewed-by: Sage Weil <sage@redhat.com>
2017-04-27 00:29:45 +08:00
Yehuda Sadeh
97157f9142 Merge pull request #13070 from cbodley/wip-rgw-meta-sync-periods
rgw multisite: fixes for meta sync across periods

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2017-04-26 09:29:26 -07:00
Kefu Chai
e6d1d9a798 Merge pull request #13061 from guzhongyan/fix_typo
osd: fix typo in comment

Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-04-27 00:26:01 +08:00
Kefu Chai
4b12805914 Merge pull request #13824 from Jing-Scott/doc-update-swift-static-web
doc: update the support status of swift static website

Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-04-27 00:17:49 +08:00
Yuri Weinstein
5129e0fc32 Merge pull request #14715 from wangzhengyong/cmpext
osd,librados: cmpext support

Reviewed-by: Sage Weil <sage@redhat.com>
2017-04-26 08:53:47 -07:00
Casey Bodley
82aea4722b Merge pull request #14299 from rzarzynski/wip-rgw-deduplicate-rgw_make_bucket_entry_name
rgw: deduplicate variants of rgw_make_bucket_entry_name().

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2017-04-26 11:38:13 -04:00
Casey Bodley
31576a001c Merge pull request #14552 from shashalu/fix-sync-status
rgw: add 'state==SyncState::IncrementalSync' condition when add item …

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2017-04-26 11:10:03 -04:00
Sage Weil
181329bb22 Merge pull request #14808 from ceph/wip-hdd-throttle-cost
common/config_opts: Set the HDD throttle cost to 1.5M

Reviewed-by: Sage Weil <sage@redhat.com>
2017-04-26 10:04:24 -05:00
Mark Nelson
34deef08a4 common/config_opts: Set the HDD throttle cost to 1.5M
Signed-off-by: Mark Nelson <mnelson@redhat.com>
2017-04-26 10:00:37 -05:00
Ilya Dryomov
9038074796 Merge pull request #14785 from idryomov/wip-krbd-exclusive-option
rbd: recognize exclusive option

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
2017-04-26 16:25:31 +02:00
Sage Weil
a04b98e01f Merge pull request #14804 from hrchu/rgwAdmin-apiDoc-getUsageInfo
doc: rgw: Get user usage needs to specify user

Reviewed-by: Sage Weil <sage@redhat.com>
2017-04-26 08:48:56 -05:00
Sage Weil
3608a00970 Merge pull request #14780 from liewegas/wip-osdmap-mempool
osd: put osdmap in mempool

Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-04-26 08:33:05 -05:00
Ilya Dryomov
192f6ca079 qa/workunits/rbd: test exclusive map option
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
2017-04-26 15:05:50 +02:00
Matt Benjamin
b584c7eb7c Merge pull request #14781 from theanalyst/rgw/cleanup/ldap_err_msg
rgw_ldap: log the ldap err in case of bind failure
2017-04-26 09:04:15 -04:00
Casey Bodley
f422d4f184 rgw: remove rgw_realm_reconfigure_delay
when the master zone is changed, this config variable was increasing the
window of time where the old master zone would continue to handle
requests to modify metadata. those changes would not be reflected by the
new metadata master zone, and would be lost to the cluster

it was an attempt to optimize for the unlikely case of multiple period
changes in a short period of time, but the logic in reload() handles this
case correctly as is

Signed-off-by: Casey Bodley <cbodley@redhat.com>
2017-04-26 08:51:02 -04:00
Casey Bodley
721e3d6ee5 rgw: require --yes-i-really-mean-it to promote zone with stale metadata
if a zone is promoted to master before it has a chance to sync from the
previous master zone, any metadata entries after its sync position will
be lost

print an error if 'period commit' is trying to promote a zone that is
more than one period behind the current master, and only allow the
commit to proceed if the --yes-i-really-mean-it flag is provided

Signed-off-by: Casey Bodley <cbodley@redhat.com>
2017-04-26 08:51:02 -04:00
Casey Bodley
bb49e2fbed rgw: period commit uses sync status markers
Signed-off-by: Casey Bodley <cbodley@redhat.com>
2017-04-26 08:51:02 -04:00
Casey Bodley
a4bf014b86 rgw: use RGWShardCollectCR for RGWReadSyncStatusCoroutine
Signed-off-by: Casey Bodley <cbodley@redhat.com>
2017-04-26 08:51:02 -04:00
Casey Bodley
0372df20be rgw: change metadata read_sync_status interface
makes the same change to read_sync_status() in RGWMetaSyncStatusManager,
needed to support multiple concurrent readers for the rest interface

Signed-off-by: Casey Bodley <cbodley@redhat.com>
2017-04-26 08:51:02 -04:00
Casey Bodley
5d6e7fae93 test/rgw: sync status ignores shard markers from previous periods
Signed-off-by: Casey Bodley <cbodley@redhat.com>
2017-04-26 08:51:02 -04:00
Casey Bodley
574ff5f5df rgw: store realm epoch with sync status markers
sync status markers can't be compared between periods, so we need to
record the current period's realm epoch with its markers. when the
rgw_meta_sync_info.realm_epoch is more recent than the marker's
realm_epoch, we must treat the marker as empty

Signed-off-by: Casey Bodley <cbodley@redhat.com>
2017-04-26 08:51:02 -04:00
Casey Bodley
a898fb76a4 rgw: RGWBackoffControlCR only retries until success
Signed-off-by: Casey Bodley <cbodley@redhat.com>
2017-04-26 08:51:01 -04:00
Casey Bodley
69be410d0e rgw: clean up RGWInitDataSyncStatusCoroutine
RGWInitDataSyncStatusCoroutine operates on a given rgw_data_sync_status
pointer, which saves us from having to read it back from rados

Signed-off-by: Casey Bodley <cbodley@redhat.com>
2017-04-26 08:51:01 -04:00
Casey Bodley
7c23713b1a rgw: fix marker comparison to detect end of mdlog period
Fixes: http://tracker.ceph.com/issues/18639

Signed-off-by: Casey Bodley <cbodley@redhat.com>
2017-04-26 08:51:01 -04:00
Casey Bodley
09c847ff79 rgw: add == and != operators for period history cursor
RGWMetaSyncCR was using operator== but it always returned true!

Signed-off-by: Casey Bodley <cbodley@redhat.com>
2017-04-26 08:51:01 -04:00
Casey Bodley
aae4c183c3 Merge pull request #13067 from cbodley/wip-rgw-test-multi-periods
test/rgw: fixes for test_multi_period_incremental_sync()

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2017-04-26 08:50:00 -04:00
hrchu
e922a98daa doc: rgw: Get user usage needs to specify user
Signed-off-by: hrchu <petertc@gmail.com>
2017-04-26 10:47:58 +00:00
Kefu Chai
ff1c0e80dd Merge pull request #14796 from tchaikov/wip-init-ceph
init-ceph: should have a space before "]"

Reviewed-by: Willem Jan Withagen <wjw@digiware.nl>
2017-04-26 16:52:00 +08:00
Kefu Chai
dbcd0ae916 init-ceph: should have a space before "]"
otherwise we will have

./bin/init-ceph: 269: [: missing ]

Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-04-26 15:12:10 +08:00
Kefu Chai
b833ba71f1 Merge pull request #12460 from umullan/bucketunlink
doc: Correcting the remove bucket example and adding bucket link/unlink examples

Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-04-26 11:57:16 +08:00
Uday Mullangi
c7fb3db372 doc: Correcting the bucket unlink example with correct syntax
Signed-off-by: Uday Mullangi <umullangi@walmartlabs.com>
2017-04-26 09:26:52 +05:30
Kefu Chai
f0f55a6f7d Merge pull request #14728 from dachary/wip-ceph-disk-lock
ceph-disk: implement prepare --no-locking

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-04-26 11:42:10 +08:00
wangzhengyong
079decf0ba test/librados/c_operations: add cmpext tests
Dispatch compare-and-read and compare-and-write compound requests, and
confirm expected behaviour under compare and miscompare conditions.

Signed-off-by: Zhengyong Wang <wangzhengyong@cmss.chinamobile.com>
Signed-off-by: David Disseldorp <ddiss@suse.de>
2017-04-26 09:11:37 +08:00
wangzhengyong
8245e822fe ceph_test_rados_api_aio: add cmpext tests
Write a buffer and compare it with a matching and non-matching buffer
via cmpext. Do this using rados_aio_cmpext(), ioctx.aio_cmpext() and
ioctx.aio_operate(op.cmpext())

Signed-off-by: Zhengyong Wang <wangzhengyong@cmss.chinamobile.com>
Signed-off-by: David Disseldorp <ddiss@suse.de>
2017-04-26 09:11:15 +08:00
wangzhengyong
0ccebc5c9b librados: add cmpext API
The compare-extent (cmpext) operation allows callers to compare existing
object contents with an arbitrary buffer. cmpext requests can be
compounded with read and write operations, allowing for atomic object
content updates. return 0 on success, negative error code
on failure, (-MAX_ERRNO - mismatch_off) on mismatch

This commit is based on Mike Christie's initial C++ API, with the
addition of AIO support and a C API. Response marshalling was also
reworked, so that the miscompare offset is unmarshalled transparently to
the caller.

Signed-off-by: Zhengyong Wang <wangzhengyong@cmss.chinamobile.com>
Signed-off-by: David Disseldorp <ddiss@suse.de>
2017-04-26 09:10:28 +08:00
wangzhengyong
351f78d7b9 ceph_test_rados_api_misc: add cmpext tests
Signed-off-by: Zhengyong Wang <wangzhengyong@cmss.chinamobile.com>
Signed-off-by: Mike Christie <mchristi@redhat.com>
[ddiss@suse.de: add rados_cmpext() test coverage]
Reviewed-by: David Disseldorp <ddiss@suse.de>
2017-04-26 09:09:32 +08:00
wangzhengyong
bfc334b537 ceph osd: add support for new op cmpext
This adds support for a new op cmpext. The request will read
extent.length bytes and compare them to extent.length bytes at
extent.offset on disk. return 0 on success, negative error code
on failure, (-MAX_ERRNO - mismatch_off) on mismatch

rbd will use this in a multi op request to implement the
SCSI COMPARE_AND_WRITE request which is used by VMware for
its atomic test and set request.

Signed-off-by: Zhengyong Wang <wangzhengyong@cmss.chinamobile.com>
Signed-off-by: Mike Christie <mchristi@redhat.com>
[ddiss@suse.de: ReplicatedPG -> PrimaryLogPG]
Reviewed-by: David Disseldorp <ddiss@suse.de>
2017-04-26 09:08:22 +08:00
Yuri Weinstein
024314e912 Merge pull request #14755 from cbodley/wip-msg-direct
core: introduce DirectMessenger

Reviewed-by: Greg Farnum gfarnum@redhat.com
Reviewed-by: Sage Weil sage@redhat.com
2017-04-25 16:52:11 -07:00
Sage Weil
64ae61a516 osd/OSDMap: put OSDMap[::Incremental] itself in mempool too
Signed-off-by: Sage Weil <sage@redhat.com>
2017-04-25 18:26:08 -04:00
Sage Weil
691bc44d59 Merge pull request #14783 from dachary/wip-crush-classe-test
test: use 7130 for crush-classes.sh

Reviewed-by: Dan Mick <dmick@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
2017-04-25 16:56:11 -05:00
Sage Weil
7e2a286446 Merge pull request #14651 from tchaikov/wip-silent-boost-build
cmake: pass -d0 to b2 if not CMAKE_VERBOSE_MAKEFILE

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2017-04-25 16:53:58 -05:00
Sage Weil
d754fbcca4 Merge pull request #14731 from ceph/wip-bluestore-type
os/bluestore: use correct bound encode size for unused

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Igor Fedotov <ifedotov@mirantis.com>
2017-04-25 16:53:44 -05:00
Sage Weil
5af0944afa Merge pull request #14738 from liupan1111/wip-fix-initial
src/common: change last_work_queue to next_work_queue. 

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-04-25 16:53:23 -05:00
Sage Weil
4ba4567bd2 Merge pull request #14757 from dmick/wip-einval
common: Better handling for missing/inaccessible ceph.conf files

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
2017-04-25 16:52:46 -05:00
Sage Weil
fee612f16f Merge pull request #14764 from Liuchang0812/wip-strip-pglog-op-name
osd: strip pglog op name

Reviewed-by: Sage Weil <sage@redhat.com>
2017-04-25 16:52:28 -05:00