os/bluestore: roundoff bluefs allocs to bluefs_alloc_size

Signed-off-by: Ramesh Chander <Ramesh.Chander@sandisk.com>

Merge pull request #14832 from dillaman/wip-rbd-mirror-deletion

rbd-mirror: image deletions should be handled by assigned instance

Reviewed-by: Mykola Golub <mgolub@mirantis.com>

Merge pull request #14842 from cbodley/wip-rgw-admin-suite

qa/rgw: fix assertions in radosgw_admin task

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>

Merge pull request #14826 from tchaikov/wip-prime-pg-temp

mon/OSDMonitor: skip prime_pg_temp if mapping is prior to osdmap

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>

Merge pull request #14818 from tchaikov/wip-rocksdb

rocksdb: sync with upstream

Reviewed-by: Brad Hubbard <bhubbard@redhat.com>

Merge pull request #14817 from TsaiJin/wip-set-boolean-variable-with-boolean-value

osd: ReplicatedBackend::prep_push() remove redundant variable assignments

Reviewed-by: Kefu Chai <kchai@redhat.com>

Merge pull request #14835 from tchaikov/wip-19743

mgr: do shutdown using finisher so we can do it in the right order

Reviewed-by: Sage Weil <sage@redhat.com>

Merge pull request #14838 from liewegas/wip-mgr-dirs

debian/ceph-base.dirs: create bootstrap-mgr dirs

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>

Merge pull request #14384 from hrchu/radosgw-admin-key

doc: rgw: Rewrite the key management

Reviewed-by: Casey Bodley <cbodley@redhat.com>

Merge pull request #14848 from dillaman/wip-19798

test: remove hard-coded image name from RBD metadata test

Reviewed-by: Mykola Golub <mgolub@mirantis.com>

Merge pull request #13315 from dang/wip-build-no-nss

cmake: Allow tests to build without NSS

Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>

Merge pull request #14367 from mslovy/wip-fix-infinitloops

os/filestore: fix infinit loops in fiemap()

Reviewed-by: Sage Weil <sage@redhat.com>

Merge pull request #14391 from LiumxNL/wip-170407

mon/PGMonitor: fix wrongly report "pg stuck in inactive"

Reviewed-by: Sage Weil <sage@redhat.com>

Merge pull request #14675 from ifed01/wip-bluestore-nolock

os/bluestore: eliminate some excessive stuff

Reviewed-by: Sage Weil <sage@redhat.com>

Merge pull request #14475 from liewegas/wip-message-compat-cruft

messages: remove compat cruft

Reviewed-by: Kefu Chai <kchai@redhat.com>

os/bluestore: move TransContext finalization out of osr_lock to avoid potential contention.

Signed-off-by: Igor Fedotov <ifedotov@mirantis.com>

os/bluestore: get rid off Onode::flush_txn set.
It looks like flushing_count counter is enough.

Signed-off-by: Igor Fedotov <ifedotov@mirantis.com>

Merge pull request #14840 from drunkard/master

doc: style fix for doc/cephfs/client-config-ref.rst

Reviewed-by: Kefu Chai <kchai@redhat.com>

doc: typo fixes in doc/cephfs/client-config-ref.rst

fixed:
  Reference symbol, i.e. s/`/``/
  Hyperlink typo at ``client_trace``

Signed-off-by: Drunkard Zhang <gongfan193@gmail.com>

Merge pull request #14302 from liewegas/wip-19452

osdc/Objecter: handle command target that goes down

Reviewed-by: Josh Durgin <jdurgin@redhat.com>

Merge pull request #14850 from tchaikov/wip-cmake

cmake: add "container" to required boost components

Reviewed-by: Casey Bodley <cbodley@redhat.com>

Merge pull request #14794 from joscollin/wip-warning-simplespin

test: fixing assert that creates warning: comparison between signed and unsigned integer expressions

Reviewed-by: Brad Hubbard <bhubbard@redhat.com>

qa/rgw: fix assertions in radosgw_admin task

Signed-off-by: Casey Bodley <cbodley@redhat.com>

cmake: add "container" to required boost components

it is used by our denc

Signed-off-by: Kefu Chai <kchai@redhat.com>

Merge pull request #14843 from wjwithagen/wip-wjw-fix-pipe

src/msg/simple/Pipe.cc: Fix the inclusion of '}'

Reviewed-by: Kefu Chai <kchai@redhat.com>

test: remove hard-coded image name from RBD metadata test

Fixes: http://tracker.ceph.com/issues/19798
Signed-off-by: Jason Dillaman <dillaman@redhat.com>

rbd-mirror: provide image status updates without remotes

Signed-off-by: Jason Dillaman <dillaman@redhat.com>

rbd-mirror: new state machine for preparing local image

This state machine will be invoked before the bootstrap state machine
and will be responsible for detecting if the local image is already
primary or if it needs to be deleted.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>

librbd: remove duplicative journal helper functions

Signed-off-by: Jason Dillaman <dillaman@redhat.com>

rbd-mirror: forward initial pool image deletions to instance

Signed-off-by: Jason Dillaman <dillaman@redhat.com>

rbd-mirror: deletions should be scheduled using global ids

Signed-off-by: Jason Dillaman <dillaman@redhat.com>

rbd-mirror: pass pool watcher image ids by rvalue

Signed-off-by: Jason Dillaman <dillaman@redhat.com>

src/msg/simple/Pipe.cc: Fix the inclusion of '}'

Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>

Merge pull request #14754 from trociny/wip-19128

rbd: import needs to sanity check auto-generated image name

Reviewed-by: Jason Dillaman <dillaman@redhat.com>

Merge pull request #14592 from prallabh/wip-manifest

rgw: custom user data header

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>

Merge pull request #14816 from cbodley/wip-rgw-test-multi-list-fix

test/rgw: fix for empty lists as default arguments

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>

Merge pull request #14473 from ShiqiCooperation/master

os/bluestore: assert blob map returns success

Reviewed-by: Sage Weil <sage@redhat.com>

Merge pull request #14491 from liewegas/wip-bluestore-deferred-rewrite

os/bluestore: rewrite deferred write handling

Reviewed-by: Igor Fedotov <ifedotov@mirantis.com>

Merge pull request #14695 from dachary/wip-choosleaf-stable

crush: builder: legacy has chooseleaf_stable = 0

Reviewed-by: Sage Weil <sage@redhat.com>

Merge pull request #14696 from dachary/wip-crush-workspace

crush: crush_init_workspace starts with struct crush_work

Reviewed-by: Sage Weil <sage@redhat.com>

Merge pull request #14814 from neha-ojha/wip-osd-filestore-default

osd: switch filestore to default to rocksdb

Reviewed-by: Sage Weil <sage@redhat.com>

Merge pull request #14795 from tchaikov/wip-so-priority-cleanup

msg/async: return right away in NetHandler::set_priority() if not supported

Reviewed-by: Haomai Wang <haomai@xsky.com>

Merge pull request #14802 from tchaikov/wip-mgr-cleanup

mgr: various cleanups

Reviewed-by: Sage Weil <sage@redhat.com>

Merge pull request #14807 from liewegas/wip-jewel-x

ceph_test_rados_api_tier: tolerate ENOENT from 'pg scrub'

Reviewed-by: Kefu Chai <kchai@redhat.com>

Merge pull request #14717 from liewegas/wip-bluestore-remove-max-ops

os/bluestore: rename/fix throttle options

Reviewed-by: Igor Fedotov <ifedotov@mirantis.com>

Merge pull request #14819 from tchaikov/wip-objecter-more-constness

osdc/Objecter: more constness

Reviewed-by: Sage Weil <sage@redhat.com>

Merge pull request #14773 from viva64/sizeof_pointer

src/msg/async/AsyncConnect.cc: Use of sizeof() on a Pointer Type

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Haomai Wang <haomai@xsky.com>

Merge pull request #14782 from yuyuyu101/wip-rdma-perf

msg/async/rdma: add inqueue rx chunks perf counter

Reviewed-by: Sage Weil <sage@redhat.com>

Merge pull request #14797 from wjwithagen/wip-wjw-freebsd-config-path

common/config: Add /usr/local/etc/ceph to default paths

Reviewed-by: Sage Weil <sage@redhat.com>

Merge pull request #14801 from tchaikov/wip-crypto-cleanup

crypto: cleanup NSPR in main thread

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Jason Dillaman <dillaman@redhat.com>

Merge pull request #14805 from tchaikov/wip-mon-check-get

mon/OSDMonitor: check get()'s return value instead of bl's length

Reviewed-by: Sage Weil <sage@redhat.com>

Merge pull request #14836 from idryomov/wip-krbd-wac-tests

qa: krbd write-after-checksum tests

Reviewed-by: Jason Dillaman <dillaman@redhat.com>

Merge pull request #14803 from hrchu/rgwadmin-api-doc-usage-conf

doc: rgw: note rgw_enable_usage_log option in adminops guide

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>

debian/ceph-base.dirs: create bootstrap-mgr dirs

Signed-off-by: Sage Weil <sage@redhat.com>

Merge pull request #14824 from renhwztetecs/renhw-wip-mgr-bootstrap

mgr: mkdir bootstrap-mgr

Reviewed-by: Sage Weil <sage@redhat.com>

qa: krbd write-after-checksum tests

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>

mgr: do shutdown using finisher so we can do it in the right order

otherwise we can shutdown a PyModules while it still being init'ed

Fixes: http://tracker.ceph.com/issues/19743
Signed-off-by: Kefu Chai <kchai@redhat.com>

common/config_opts.h: Allow for /usr/local/etc/ceph to hold keyrings

Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>

Merge pull request #14831 from smithfarm/wip-stress-split

tests: fix broken links in upgrade/hammer-jewel-x/stress-split

rocksdb: sync with upstream

to avoid warning with glibc 2.25, see
https://github.com/facebook/rocksdb/pull/2208 and
https://github.com/ceph/rocksdb/pull/17

Signed-off-by: Kefu Chai <kchai@redhat.com>

build/ops: cmake: explicitly disable MSSE 4.2 if not supported

This became necessary when upstream unconditionally enabled MSSE 4.2
via https://github.com/facebook/rocksdb/commit/bc397325

Signed-off-by: Nathan Cutler <ncutler@suse.com>
Signed-off-by: Kefu Chai <kchai@redhat.com>

Merge pull request #14751 from trociny/wip-19716

test/librbd/test_notify.py: don't disable feature in slave

Reviewed-by: Jason Dillaman <dillaman@redhat.com>

tests: fix broken links in upgrade/hammer-jewel-x/stress-split

Fixes: http://tracker.ceph.com/issues/19793
Signed-off-by: Nathan Cutler <ncutler@suse.com>

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>

mon/OSDMonitor: skip prime_pg_temp if mapping is prior to osdmap

Signed-off-by: Kefu Chai <kchai@redhat.com>

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>

src/osd/ReplicatedBackend.cc: remove redundant assignments which have been done in constructor function

Signed-off-by: Jin Cai <caijin.caij@alibaba-inc.com>

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>

cmake: os should depend on crypto_plugins not a certain plugin

Signed-off-by: Kefu Chai <kchai@redhat.com>

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>

osdc/Objecter: more constness

Signed-off-by: Kefu Chai <kchai@redhat.com>

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>

doc: rgw: note rgw_enable_usage_log option in adminops guide

Signed-off-by: hrchu <petertc@gmail.com>

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>

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>

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>

os/bluestore: narrow lock scope in _deferred_aio_finish

Signed-off-by: Sage Weil <sage@redhat.com>

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>

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>

os/bluestore/KernelDevice: handle non-block-aligned backing file

Fixes: http://tracker.ceph.com/issues/16644
Signed-off-by: Sage Weil <sage@redhat.com>

osd: switch filestore to default to rocksdb

Signed-off-by: Neha Ojha <nojha@redhat.com>

Merge pull request #14714 from cbodley/wip-19446

rgw: dont spawn error_repo until lease is acquired

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>

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>

Merge pull request #13053 from Ted-Chang/kstore-bloom-filter

os/kstore: Added rocksdb bloom filter settings

Reviewed-by: Sage Weil <sage@redhat.com>

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>

Merge pull request #13061 from guzhongyan/fix_typo

osd: fix typo in comment

Reviewed-by: Kefu Chai <kchai@redhat.com>

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>

Merge pull request #14715 from wangzhengyong/cmpext

osd,librados: cmpext support

Reviewed-by: Sage Weil <sage@redhat.com>

os/bluestore: observe bluestore_throttle_cost_* options

Signed-off-by: Sage Weil <sage@redhat.com>

os/bluestore: rename throttle configs: bluestore_throttle[_deferred]_bytes

Signed-off-by: Sage Weil <sage@redhat.com>

os/bluestore: remove bluestore_max_ops

Signed-off-by: Sage Weil <sage@redhat.com>

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>

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>

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>

common/config_opts: Set the HDD throttle cost to 1.5M

Signed-off-by: Mark Nelson <mnelson@redhat.com>

Merge pull request #14785 from idryomov/wip-krbd-exclusive-option

rbd: recognize exclusive option

Reviewed-by: Mykola Golub <mgolub@mirantis.com>

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>

ceph_test_rados_api_tier: tolerate ENOENT from 'pg scrub'

Signed-off-by: Sage Weil <sage@redhat.com>

Merge pull request #14780 from liewegas/wip-osdmap-mempool

osd: put osdmap in mempool

Reviewed-by: Kefu Chai <kchai@redhat.com>

qa/workunits/rbd: test exclusive map option

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>