Commit Graph

71633 Commits

Author SHA1 Message Date
Kefu Chai
60d95d4007 Merge pull request #14820 from tchaikov/wip-deb-maint-fun
debian: package crypto plugin only on amd64

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2017-04-27 18:47:14 +08:00
Kefu Chai
314ad07d57 mon/OSDMonitor: skip prime_pg_temp if mapping is prior to osdmap
Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-04-27 16:40:25 +08:00
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
caijin.caij
e0156592e5 src/osd/ReplicatedBackend.cc: remove redundant assignments which have been done in constructor function
Signed-off-by: Jin Cai <caijin.caij@alibaba-inc.com>
2017-04-27 16:06:05 +08:00
Kefu Chai
cd4dbaea3a debian: package crypto plugins only on amd64
currently, only plugin based on isa-l is installed. archs other than
amd64 will not have this directory or the plugin(s) residing in it.
hence dh_install will fail when trying to copy nonexistence file/dir.

* debian/ceph-common.install: chmod +x, and only install crypto on amd64
  so dh_install can filter the install list using dh-exec
* debian/control: depends on dh-exec now. dh-exec v0.13 introduces support
  for filtering based on architecture. see dh-exec's changelog for more
  details. but trusty only offers dh-exec v0.12. so do not require ">=
  0.13) at this moment.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-04-27 15:14:16 +08:00
Kefu Chai
53726b8ed2 cmake: os should depend on crypto_plugins not a certain plugin
Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-04-27 13:28:45 +08:00
Kefu Chai
b22977dfd2 crypto: cleanup NSPR in main thread
quote from nspr's header file

```
 * Perform a graceful shutdown of NSPR.  PR_Cleanup() may be called by
 * the primordial thread near the end of the main() function.
```

this helps to silence some warnings from valgrind. but it does not hurt
in practice, because the process is about to die. and the freed memory
chunks are only allocated once in NSPR.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-04-27 12:14:04 +08:00
Kefu Chai
d989151035 osdc/Objecter: more constness
Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-04-27 11:25:56 +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
hrchu
e7896f6858 doc: rgw: note rgw_enable_usage_log option in adminops guide
Signed-off-by: hrchu <petertc@gmail.com>
2017-04-27 00:52:24 +00:00
Jos Collin
c931002f6b test: fixing assert that creates warning: comparison between signed and unsigned integer expressions
This fixes the additional comments in the PR: https://github.com/ceph/ceph/pull/14705
Fixed the review comments too.

Signed-off-by: Jos Collin <jcollin@redhat.com>
2017-04-27 06:16:26 +05:30
Casey Bodley
3f237a134d test/rgw: fix for empty lists as default arguments
i was incorrectly using [] as a default function argument, without
realizing that default values are mutable and shared across invocations

Signed-off-by: Casey Bodley <cbodley@redhat.com>
2017-04-26 19:38:53 -04: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
Sage Weil
65c2a88d0d os/bluestore: narrow lock scope in _deferred_aio_finish
Signed-off-by: Sage Weil <sage@redhat.com>
2017-04-26 16:58:42 -04:00
Sage Weil
7a59f60646 os/bluestore: use superclass for aio completions
This is less fragile and more explicit than using the lower bit
of the priv pointer.

Signed-off-by: Sage Weil <sage@redhat.com>
2017-04-26 16:58:41 -04:00
Sage Weil
c27df93229 os/bluestore: restructure deferred writes
Explicitly aggregate deferred writes into a batch.  When we
submit, take the opportunity to coalesce contiguous writes.
Handle aio completion independently from the original txcs.

Note that this paves the way for a few additional steps:

1- we could make deallocations cancel deferred writes.
2- we could drop the txc deferred states entirely and rely on
the explicit deferred write batch machinery instead... if we
build an alternative way to complete the SharedBlob writes
and ensure the lifecycle issue are dealt with.  (I'm not sure
it would be worth it, but it might be.)

Signed-off-by: Sage Weil <sage@redhat.com>
2017-04-26 16:03:35 -04:00
Sage Weil
8c32e69c66 os/bluestore/KernelDevice: handle non-block-aligned backing file
Fixes: http://tracker.ceph.com/issues/16644
Signed-off-by: Sage Weil <sage@redhat.com>
2017-04-26 16:03:34 -04:00
Neha Ojha
ba96197e6d osd: switch filestore to default to rocksdb
Signed-off-by: Neha Ojha <nojha@redhat.com>
2017-04-26 12:27:24 -07: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
Sage Weil
fb88c35232 os/bluestore: observe bluestore_throttle_cost_* options
Signed-off-by: Sage Weil <sage@redhat.com>
2017-04-26 11:39:13 -04:00
Sage Weil
d0c8721f7e os/bluestore: rename throttle configs: bluestore_throttle[_deferred]_bytes
Signed-off-by: Sage Weil <sage@redhat.com>
2017-04-26 11:39:13 -04:00
Sage Weil
c2a1c30d72 os/bluestore: remove bluestore_max_ops
Signed-off-by: Sage Weil <sage@redhat.com>
2017-04-26 11:38:42 -04: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
Abhishek Lekshmanan
3959a8b52c rgw: use a vector for options passed to civetweb
Since the array we used needs additional check to ensure that the size
is correct, and causes undefined behaviour in a few platforms, using a
vector and passing the c array back to mg_start so that we don't go past
the end of array.

Fixes: http://tracker.ceph.com/issues/19749
Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
Signed-off-by: Jesse Williamson <jwilliamson@suse.de>
2017-04-26 17:05:40 +02: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
7798fcbced ceph_test_rados_api_tier: tolerate ENOENT from 'pg scrub'
Signed-off-by: Sage Weil <sage@redhat.com>
2017-04-26 09:47:09 -04: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