cls_user: remove duplicated words

Signed-off-by: Li Peng <lip@dtdream.com>

Merge pull request #8891 from tchaikov/wip-fix-test-using-dash

test/encoding/readable.sh: use bash instead of sh

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

Merge pull request #8889 from linuxbox2/rbd-nbd-cmake

cmake: fix rbd-nbd linkage

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

test/encoding/readable.sh: use bash instead of sh

aside from the `source` statement, the readable.sh is POSIX shell
script. we can just "." the referenced helper script. but to be
consistent with other encoding/*.sh scripts, let's just change the
shebang line to "#!/bin/bash".

Signed-off-by: Kefu Chai <tchaikov@gmail.com>

Merge pull request #8885 from stiopaa1/osd_removeSendMessageConn

osd/OSD.h: remove C_OSD_SendMessageOnConn class

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

Merge pull request #8072 from yuyuyu101/wip-async-skip-steps

async: skip unnecessary steps when parsing simple messages

cmake: fix rbd-nbd linkage

Use correct name for librbd, add parse_secret_objs and its
keyutils libdep.

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>

Merge pull request #8883 from dillaman/wip-15685

librbd: clone fails if config overridden to use image format 1 by default

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

Merge pull request #8882 from liewegas/wip-check-port

test/mon/mon-created-time: put on unique port

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

Merge pull request #8884 from ktdreyer/docs-packaging

doc: remove references to old EOL releases

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

Merge pull request #8864 from trociny/fixup-rbd-mirror-test-log

qa/workunits/rbd: fix rbd-mirror log file name

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

librbd: default clone operation to image format 2

Image format 1 doesn't support clones, so unless the user
overrode the setting, default to format 2.

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

librbd: add rbd_image_options_is_set helper method to API

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

Merge pull request #8877 from dillaman/wip-15664

rbd-mirror: lockdep error during bootstrap

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

doc: remove references to old EOL releases

There were several references to old releases like "dumpling",
"emperor", and "firefly", throughout the docs. Remove these and update
the examples to use jewel instead.

Remove references to CentOS 6 and RHEL 6, since we only support CentOS 7
now.

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

osd/OSD.h: remove C_OSD_SendMessageOnConn class

Signed-off-by: Michal Jarzabek <stiopa@gmail.com>

test/mon/mon-created-time: put on unique port

7122 is also used by test/osd/osd-reactivate.sh

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

Merge pull request #8770 from ceph/wip-cmake

cmake: build fixes

Merge pull request #8844 from stiopaa1/log_removelexical

common/Graylog.h: remove lexical cast

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

Merge pull request #8879 from ktdreyer/doc-rm-up2date

doc: drop references to "up2date"

doc: drop references to "up2date"

"up2date" has not been used since very old versions of RHEL (rhel4 or
5?). We only support el7 now, which is a yum-based platform.

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

Merge pull request #8878 from ktdreyer/wip-doc-rbd-dillaman

doc: Jason Dillaman is now RBD lead

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

doc: Jason Dillaman is now RBD lead

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

cmake: Added rbd-nbd target

Signed-off-by: Ali Maredia <amaredia@redhat.com>

librbd: disable automatic refresh of image upon lock message

There is no need to refresh the image upon request/release/acquire
of the exclusive lock.  The next IO or maintenance op will kick off
the refresh.  This is interfering with the refresh state machine
unit test case (since two concurrent refreshes shouldn't be possible).

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

librbd: update_features should release lock if acquired

There is a small window where requests are unblocked and before
the image is shut down where new requests can be accepted.  These
are correctly canceled during the shut down, but it can lead to
warning messages.

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

librbd: avoid applying refreshed image config within librados callback

There is a potential that a synchronous API call could deadlock a
image refresh.

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

rbd-mirror: don't use temporary string for snap operation

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

librbd: avoid recursive locking within operation state machine

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

compressor: tests for zlib & snappy changes

plugin_dir and compressor_dir not needed by
test_compression_snappy & test_compression_zlib
because they statically link compressor libraries.

Signed-off-by: Ali Maredia <amaredia@redhat.com>

cmake: rbd_mirror updates

Signed-off-by: Ali Maredia <amaredia@redhat.com>

cmake: update env vars for osd-copy-from.sh

Signed-off-by: Ali Maredia <amaredia@redhat.com>

cmake: CEPH_LIB defaults to .libs in cpp unit tests

This makes it possible to run applicable unit tests
without setting environment varibles after building
with autotools.

This will be reverted once autotools is deprecated.

Signed-off-by: Ali Maredia <amaredia@redhat.com>

cmake: add test_pool_quota.sh to

Signed-off-by: Ali Maredia <amaredia@redhat.com>

vstart: put missing quotes around cmake env vars

Signed-off-by: Ali Maredia <amaredia@redhat.com>

test: added env var setting to make check scripts

Signed-off-by: Ali Maredia <amaredia@redhat.com>

cmake: script that sets env vars for unit tests

Signed-off-by: Ali Maredia <amaredia@redhat.com>

Merge pull request #8874 from roidayan/xio-remove_unused_mutex

xio: remove unused mutex

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

xio: remove unused mutex

Signed-off-by: Roi Dayan <roid@mellanox.com>

Merge pull request #8872 from dachary/wip-make-check

tests: enable make check on ext4 (part 2)

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

tests: enable make check on ext4 (part 2)

Followup of 475cc08c330e639b226f2ab57dedbe4495f63022

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

Merge pull request #8851 from liewegas/wip-make-check

qa/workunits/ceph-helpers.sh: make ceph-osd behave on ext4

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

qa/workunits/rbd: fix rbd-mirror log file name

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

Merge pull request #8859 from liewegas/wip-fix-scrub

include/rados: fix scrub-map definition

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

include/rados: fix scrub-map definition

In commit 40add6a63defd09b47c594171c0f72906d218cc6 we
changed the scrub-map op code, breaking compatibility.

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

Merge pull request #8842 from SUSE/wip-msd-typo-fix

systemd: fix typo in preset file

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

ceph_time: add operator<< for more clock types

ceph_time: add operator<< for more clock types

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

Revert "Merge pull request #8346 from yuyuyu101/wip-async-clock"

This reverts commit 37117823d108dcd5145421adc0121eea75633851, reversing
changes made to 5ff4988c09ccc2af6ff72f30d053b5864a8c8e14.

This broke the build:

msg/async/Event.cc: In member function 'int EventCenter::process_time_events()':
error: msg/async/Event.cc:280:30: cannot bind 'std::basic_ostream' lvalue to 'std::basic_ostream&&'
ldout(cct, 10) << __func__ << " cur time is " << now << dendl;
^

and elsewhere...

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

qa/workunits/ceph-helpers.sh: make ceph-osd behave on ext4

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

ceph_time: add operator<< for more clock types

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

Merge pull request #8838 from cbodley/wip-cmake-rbd-mirror-replay-status

cmake: add missing source file to rbd_mirror/image_replayer

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

common/Graylog.h: remove lexical cast

We can use std::to_string instead of boost's lexical_cast, which saves
us from including lexical_cast header.

Signed-off-by: Michal Jarzabek <stiopa@gmail.com>

systemd: fix typo in preset file

Signed-off-by: Nathan Cutler <ncutler@suse.com>

Merge pull request #8346 from yuyuyu101/wip-async-clock

msg/async/Event: replace ceph_clock_now with coarse_mono_clock

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

Merge pull request #8109 from majianpeng/bluestore-cleancode

os/bluestore/BlueStore: cleanup code

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

Merge pull request #8110 from majianpeng/bluestore-aio-log

os/bluestore/KernelDevice: Fio aio_write, it call _aio_log_finish by …

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

Merge pull request #8416 from vumrao/wip-vumrao-15308

librados: modify Pipe::connect() to return the error code - part 1

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>

Merge pull request #8532 from xiexingguo/xxg-wip-misc

osd: miscellaneous fixes

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

Merge pull request #8599 from yangdongsheng/on_abort

os: fix submit_transaction return codes

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Haomai Wang <haomai@xsky.com>

Merge pull request #8629 from tchaikov/wip-rados_ping_monitor

librados: always set the outstrlen for rados_ping_monitor()

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

Merge pull request #8677 from tchaikov/wip-graylog-cleanup

log: remove unnecessary src/log/Graylog.*

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

Merge pull request #8693 from cooboos/perf-reset

common: show success/fail info in json for 'perf reset' command

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

Merge pull request #8731 from Yan-waller/yj-wip-fixkqueue

msg/async: fix some return values and typo.

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

cmake: add missing source file to rbd_mirror/image_replayer

fixes an undefined reference when linking librbd_mirror_internal.a

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

Merge pull request #8454 from jdurgin/wip-mirror-test2

rbd_mirror.sh: add env vars to allow running under teuthology

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

Merge pull request #8836 from athanatos/wip-15655

mon/OSDMonitor: avoid underflow in reweight-by-utilization if max_change=1

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

Merge pull request #8648 from ffilz/master

libcephfs: add ceph_ll_mknod wrapper for ll_mknod

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

Merge pull request #8820 from ceph/wip-cmake-compression

cmake: fix linking of compressor and plugins

Reviewed-by: Ali Maredia

Merge pull request #8822 from cbodley/wip-cmake-tmp-virtualenv

cmake: put virtualenv directories under /tmp

Reviewed-by: Ali Maredia <amaredia@redhat.com>

cmake: fix for unittest_async_compressor

this test wasn't creating the lib/compressor subdirectory, so it
depended on test_compressor_plugin_zlib or test_compressor_plugin_snappy
being run first

added the same dirty hack to copy libceph_snappy.so into lib/compressor,
and added a dependency on ceph_snappy to make sure it's built

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

cmake: fix linking of compressor and plugins

libcommon now includes the compressor objects necessary to load
compressor plugins

also removed extra dependencies on the plugins and their unit tests

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

qa/workunits/rbd: add env vars to adapt rbd_mirror.sh to teuthology

With these set, this script can work in teuthology, where we want to
control the how daemons run and their log locations, valgrind
settings, etc. The workunit task always sets CEPH_ID, and allows
other env vars to be configured optionally.

The RBD_MIRROR_USE_EXISTING_CLUSTER option can also speed up local testing.

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

qa: rbd_mirror.sh: change parameters to cluster rather than daemon name

Daemon name is only useful to differentiate asok and pid filenames, so
just inline its use there. Everywhere else replace the 'daemon'
parameter with cluster or local_cluster as appropriate.

Remove the CLUSTER{1,2}_DAEMON vars as well, since they are no longer
used.

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

Merge pull request #8817 from dillaman/wip-15572

librbd: reduce log level for errors encountered disabling object-map while flatten is in-progress

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

Merge pull request #8819 from dillaman/wip-14540

rbd: disk usage now includes all snapshots by default

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

cmake: put virtualenv directories under TMPDIR

this was required for cmake-check to find ceph-disk and ceph-detect-init
in the PATH

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

Merge pull request #8442 from trociny/wip-rbd-mirror-status

rbd-mirror: replay status now available via the rbd api and cli

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

ObjectCacher: don't loop the extents of OSDWrite in map_writeReviewed-by

ObjectCacher: don't loop the extents of OSDWrite in map_write

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

Merge pull request #7830 from yuyuyu101/wip-14907

IoCtxImpl: delete C_WatchCB2 when free LingerOp

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

Merge pull request #8635 from runsisi/wip-fix-md-list

cls_rbd: fix loop condition when listing image metadata

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

Merge pull request #8661 from runsisi/wip-fix-snapc-validation

librbd: put the validation of image snap context earlier

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

Merge pull request #7800 from renhwsky/renhw-wip-osdmonitor-have_pending_crush

mon/OSDMonitor: _have_pending_crush of return value should be bool

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

qa/workunits/rbd: test mirror status in pool directory

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

rbd-mirror: in replay status store number of entries behind master

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

Merge pull request #8305 from tchaikov/wip-fix-vstart

vstart: make -k with optional mon_num (part 2)

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

osd/osdmonitor: _have_pending_crush of return value should be bool

have_pending_crush of return value should be bool, fix it

Signed-off-by: huanwen ren <ren.huanwen@zte.com.cn>

Merge pull request #8823 from aderumier/deb-default-tcmalloc-cache-size

etc/default/ceph: set 128MB tcmalloc cache size

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

set 128MB tcmalloc cache size by bytes

OSDMonitor: avoid underflow in reweight-by-utilization if max_change=1

Fixes: http://tracker.ceph.com/issues/15655
Signed-off-by: Samuel Just <sjust@redhat.com>

etc/default/ceph: set 128MB tcmalloc cache size

Signed-off-by: Alexandre Derumier <aderumier@odiso.com>

rbd: disk usage now includes all snapshots by default

Added a new "--from-snap" optional to restrict the calculation to
specific subsets of snapshots and the HEAD revision.

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

Merge pull request #8568 from ddiss/osd-librados-writesame

OSD and librados writesame support

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Haomai Wang <haomai@xsky.com>

Merge pull request #8791 from dillaman/wip-15574

librbd: parent image is closed twice if error encountered while opening

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

Merge pull request #8790 from dillaman/wip-15630

rbd-mirror: interrupting image replay startup can cause crash

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

Merge pull request #8785 from tchaikov/wip-librbd-bad-header

librbd: does not crash if image header is too short

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

Merge pull request #8813 from trociny/fix-test-librbd-aio_write

test: librbd: aio write/discard completion should always return 0 on success

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

test: librbd: aio write/discard completion should always return 0 on success

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

librbd: block RPC requests while updating features

Disabling the journal and object map require acquiring the exclusive
lock locally.  We don't want to start executing long-running ops
for this quick process.

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

librbd: return -ESHUTDOWN when a refresh is requested on a closed image

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

librbd: synchronous block_writes should return possible error result

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