Merge pull request #14476 from wjwithagen/wip-wjw-freebsd-ceph-disk-call-rc.d

ceph-disk/ceph_disk/main.py: fix calling of the bsdrc init scripts

Reviewed-by: Loic Dachary <ldachary@redhat.com>

Merge pull request #14399 from ifed01/wip-bluestore-better-better-reuse

os/bluestore: refactor small write handling to reuse blob more effect…

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

Merge pull request #14422 from tchaikov/wip-19427

mon/MonClient: make get_mon_log_message() atomic

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

Merge pull request #14439 from adamemerson/wip-warning-sign

misc: Warning Elimination

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

Merge pull request #14347 from ukernel/wip-19501

mds: make C_MDSInternalNoop::complete() delete 'this'

Reviewed-by: John Spray <john.spray@redhat.com>

Merge pull request #14460 from dillaman/wip-qa-rbd-cli

qa/workunits: corrected issues with RBD cli test

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

ceph-disk/ceph_disk/main.py: fix calling of the bsdrc init scripts

 - rc.d/ceph does not really like the extra stop/start as las cmd.
 - And make Start and Stop look similar.

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

Merge pull request #14467 from badone/wip-debug-mon-features-api-removal-cleanup

mon: Tidy up removal of debug mon features

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

Merge pull request #14361 from ShiqiCooperation/master

mailmap: shiqi affiliation

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

Merge pull request #14446 from badone/wip-cppcheck-errors

Wip cppcheck errors

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

test: Suppress cppcheck error

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

Merge pull request #14419 from badone/wip-doc-pg-states-min_size

docs: Clarify the relationship of min_size to EC pool recovery

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

mon: Tidy up removal of debug mon features

545bc83 removed most of the plumbing for the debug mon features admin
socket commands but failed to remove the register/unregister command
pairs. This means the monitor asserts if an attempt is made to use any
of these commands.

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

Merge pull request #14290 from wjwithagen/wip-wjw-freebsd-procprefix

core: Prefix /proc/ with FreeBSD emulation

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

Merge pull request #14362 from majianpeng/fs-remove-redundant-code

os/fs/FS.cc: remove the redundant code.

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

Merge pull request #14462 from pdinnen/patch-2

doc: correct arguments for ceph tell osd.N bench

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

doc: correct arguments for ceph tell osd.N bench

Signed-off-by: Patrick Dinnen pdinnen@gmail.com

Merge pull request #14461 from dmick/master

stop.sh: boilerplate error (don't stop mon when stopping mgr)

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

stop.sh: boilerplate error (don't stop mon when stopping mgr)

Signed-off-by: Dan Mick <dan.mick@redhat.com>

Merge pull request #14376 from cbodley/wip-rgw-forward-canned-acl

rgw: fix for EINVAL errors on forwarded bucket put_acl requests
Reviewed-by: Orit Wasserman <owasserm@redhat.com>

Merge pull request #13105 from rjfd/wip-18481

librbd: deferred image deletion

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

qa/workunits: corrected issues with RBD cli test

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

Merge pull request #14355 from cbodley/wip-19505

rgw: allow larger payload for period commit

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

Merge pull request #14319 from cbodley/wip-19488

rgw: multisite: fixes for zonegroup redirect

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

Merge pull request #14343 from Liuchang0812/wip-rgw-read-user-buckets

rgw: update is_truncated in function rgw_read_user_buckets

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

Merge pull request #14438 from theanalyst/fix/build-doc

script: build-doc/serve-doc fixes

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

Merge pull request #14455 from optimistyzy/411_1

os/bluestore/NVMEDevice: fix the compilation issue for collect_metadata

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

Merge pull request #13698 from ukernel/wip-multimds-misc

mds: miscellaneous multimds fixes

Reviewed-by: John Spray <john.spray@redhat.com>

Merge pull request #14453 from trociny/wip-test_mock_InstanceWatcher

test/rbd_mirror: race in TestMockInstanceWatcher on destroy

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

pybind: librbd: added trash API to python RBD binding

Signed-off-by: Ricardo Dias <rdias@suse.com>

qa/workunits/rbd: cli testing of rbd trash commands

Signed-off-by: Ricardo Dias <rdias@suse.com>

rbd: added image-id optional to Info command

Signed-off-by: Ricardo Dias <rdias@suse.com>

rbd: Added image-id optional to Snap commands

Signed-off-by: Ricardo Dias <rdias@suse.com>

rbd: added image_id param to Utils::init_and_open_image

Signed-off-by: Ricardo Dias <rdias@suse.com>

rbd: added group image remove by id to CLI

Signed-off-by: Ricardo Dias <rdias@suse.com>

librbd: added group image remove by id to API

Signed-off-by: Ricardo Dias <rdias@suse.com>

rbd: added CLI support for trash operations

Signed-off-by: Ricardo Dias <rdias@suse.com>

librbd: added trash methods to API

Signed-off-by: Ricardo Dias <rdias@suse.com>

librbd: open image gets name from directory or trash

Signed-off-by: Ricardo Dias <rdias@suse.com>

librbd: added open an image by id to API

Signed-off-by: Ricardo Dias <rdias@suse.com>

cls_rbd: methods to manipulate the rbd_trash object

Signed-off-by: Ricardo Dias <rdias@suse.com>

bluestore/NVMEDevice: fix the compilation issue for collect_metadata

Signed-off-by: optimistyzy <optimistyzy@gmail.com>

test/rbd_mirror: race in TestMockInstanceWatcher on destroy

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

Merge pull request #14295 from theanalyst/release/10.2.7/notes

doc: release notes for v10.2.7 Jewel

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>

Merge pull request #14441 from theanalyst/doc/changelog/v10.2.7

doc: add changelog for v10.2.7

Reviewed-by: Loic Dachary <ldachary@redhat.com>

Merge pull request #14426 from tchaikov/wip-13562-kefu

misc: SCA fixes

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

test: Silence cppcheck memory leak warnings in ceph_test_rados_api_io

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

denc: Silence cppcheck uninitialised variable errors

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

common: Restructure cppcheck suppresions

Some of the suppressions are currently redundant and some need to be
changed.

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

crypto: Suppress cppcheck error

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

blkdev: Suppress cppcheck error

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

librados: Since a pragma push was removed, get rid of that pop

Don't you think the plural of pragma should be pragmata?

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>

cmake: Make -Wno-unknown-pragmas common to all compilers

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>

bluestore: Remove unused expression in statement

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>

filestore: Fix uninitialized return

In some error conditions we were returning the value of an
uninitialized variable.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>

rbd: Remove pessimizing move

Do not std::move returned values.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>

cls: Fix order of operations of std::string constructor

Presumably the intent was to create a string with 128 '1's, rather than
a string with 49 '\200's.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>

rgw: Remove pessimizing move of return values

C++ performs copy elision of return values if:

1. The value is a local declared in the function (i.e. not a
   parameter)
2. The type of the value in the return statement is, modulo
   const-value qualification, identical to the return type of the
   function.

An RValue reference to a type is not identical, modulo const-value
qualification, to the type it is a reference to.

Do not std::move local values in the return statement unless the value
is a parameter or you will make the compiler perform a copy it would
iotherwise avoid.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>

rgw: Make AuthResult::get_completer return rvalue reference

Since we are explicitly moving the completer out of the AuthResult
and allowing the client to have ownership of it, simply return an
rvalue reference rather than moving into a temporary that is itself
returned.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>

msg: Remove pessimizing move

Do not std::move the result of a function returning a value.

(Once could reasonably std::move the result of a function returning an
lvalue reference, but *not* that of one returning a value.)

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>

osd: The shard_id_t constructor takes an int8_t

So pass it -1 rather than 255 to avoid an implicit conversion warning.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>

monc: Remove pessimizing move

Calling std::move on on a function returning a value can interfere
with RVO. At best it has no effect, but can actively interfere with
Copy/Move Elision and make code less efficient.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>

Merge pull request #13940 from Adirl/out

msg/async/rdma: Update fix broken compilation

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

Merge pull request #14409 from Adirl/conn_info

msg/async/rdma: RDMA-CM, Pass specific ConnMgr info in constructor

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

Merge pull request #14410 from Adirl/get_device

msg/async/rdma: RDMA-CM, get_device() by ibv_context

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

Merge pull request #13073 from chardan/jfw-wip-15475-admin_heap_command

osd: add "heap *" admin command

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

Merge pull request #14235 from nvedant07/bug_fix_3

rados: more info added to pool deletion error

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

Merge pull request #14022 from batrick/admin-socket-close-error

common: do not print error when asok is closed

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

Merge pull request #14292 from joscollin/wip-radosacl-warning

tools: warning, ‘%.16x’ directive output truncated writing 16 bytes into a region of size 9.

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

Merge pull request #14301 from Andrey1994/master

build: Add Virtuozzo Linux support

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

Merge pull request #14336 from Adirl/fix_sockaddr

src/msg/async: Update fix broken compilation for Posix

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

doc: add changelog for v10.2.7

Signed-off-by: Abhishek Lekshmanan <alekshmanan@suse.com>

Merge pull request #14039 from dachary/wip-19307-set-deviceclass

mon/OSDMonitor: osd crush set-device-class

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

Merge pull request #14208 from dachary/wip-crush-uniform-weights

crush: bucket: crush_add_uniform_bucket_item should check for uniformity

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

Merge pull request #14209 from dachary/wip-crush-create-default-tunables

crush: builder: creating crush map with optimal configurations

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

Merge pull request #14401 from dillaman/wip-rbd-import-fixes

rbd: correct issues with image importing

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

Merge pull request #14437 from cernceph/dvanders_mgrrotate

ceph-mgr: rotate logs on sighup

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

script: serve-doc print the port we're serving

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>

script: build-doc use python2 only for virtualenv

This is because the sphinx-ditaa package and ceph's rbd/rgw/rados pybind
require python2

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>

doc: release notes for v10.2.7 Jewel

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>

Merge pull request #14413 from hansbogert/patch-3

doc: rgw: remove mention of megabytes for quotas

Reviewed-by: Daniel Gryniewicz <dang@redhat.com>

logrotate.conf: also sighup the ceph-mgr

Tell ceph-mgr to reopen its logs postrotate.

Fixes: http://tracker.ceph.com/issues/19568
Signed-off-by: Dan van der Ster <daniel.vanderster@cern.ch>

ceph_fuse.cc: fix 64/32bit detection

Fix for:

[src/ceph_fuse.cc:111]: (style) Condition 'sizeof(long)==4' is always false

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>

lua_bufferlist.cc: use static_cast instead of c-style

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>

BitAllocator_test.cc: use static_cast instead of c-style

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>

test_librbd.cc: use static_cast instead of c-style

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>

rgw_rest_s3.cc: use static_cast instead of c-style

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>

PrimaryLogPG.cc: use static_cast instead of c-style

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>

osd/PG.cc: use static_cast instead of c-style

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>

BitAllocator.cc: use static_cast instead of c-style

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>

Merge pull request #14430 from jcsp/wip-19566-monassert

mon: avoid segfault in wait_auth_rotating

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

ceph-mgr: reopen logs on SIGHUP

Wire up the sighup_handler to reopen logs, like the other daemons.

Fixes: http://tracker.ceph.com/issues/19568
Signed-off-by: Dan van der Ster <daniel.vanderster@cern.ch>

Merge pull request #14428 from tchaikov/wip-ceph_objectstore_tool-kill-all

tests: ceph_objectstore_tool.py: kill all daemons

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

Merge pull request #10636 from fullerdj/wip-djf-15069

cephfs: Permit recovering metadata into a new RADOS pool

Reviewed-by: John Spray <john.spray@redhat.com>

mon: avoid segfault in wait_auth_rotating

MonClient users should not be calling into MonClient
after calling shutdown().  However, MonClient should
assert out rather than proceeding to try and
follow a maybe-null pointer.

Related to http://tracker.ceph.com/issues/19566

Signed-off-by: John Spray <john.spray@redhat.com>

tests: ceph_objectstore_tool.py: kill all daemons

init-ceph kills all daemons that can be identified by get_name_list() by
default, so no need to list them explicitly. also, without this change,
mgr is not stopped when the test finishes.

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

osd/OSD.cc: use static_cast instead of c-style

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>

rgw_rest_s3.cc: reorder checks in while loop

Fix for:

[src/rgw/rgw_rest_s3.cc:1224]: (style) Array index 'chunk_offset'
 is used before limits check.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>

AsyncMessenger.cc: fix FORWARD_NULL

Use assert to ensure Message *m is not NULL.

Fix for:

CID 1399578 (#4 of 4): Dereference after null check (FORWARD_NULL)
 var_deref_model: Passing null pointer m to submit_message,
 which dereferences it.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>

rgw_file.h: fix potential data race condition

Fix for:

CID 1399581 (#1 of 1): Data race condition (MISSING_LOCK)
 missing_lock: Accessing this->state.atime without holding lock
 rgw::RGWFileHandle.mtx. Elsewhere, "_ZN3rgw13RGWFileHandle5StateE.atime"
 is accessed with rgw::RGWFileHandle.mtx held 2 out of 3 times
 (2 of these accesses strongly imply that it is necessary).

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>