journal: reschedule watch if no entries available during live replay

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

librbd: correct valgrind memcheck errors

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

Merge pull request #8120 from SUSE/wip-15138

RPM: fix openldap and openssl build dependencies for SUSE

Reviewed-by: Abhishek Lekshmanan <abhishek@suse.com>
Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
Reviewed-by: Jun Huang <hjwsm1989@gmail.com>

Merge pull request #8114 from liewegas/wip-tmap-migrate

qa/workunits/rados/test.sh: test tmap_migrate

Merge pull request #8119 from dillaman/wip-qa-rbd-copy

rbd: clone operation should default to image format 2

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

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

test: fixup and improvements for rbd-mirror test

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

Merge pull request #8129 from dillaman/wip-qa-rbd-permissions

test: fix issues discovered via the rbd permissions test case

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

Merge pull request #8124 from dillaman/wip-qa-rbd-lock-fence

test: handle exception thrown from close during rbd lock test

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

qa/workunits/rbd: disable deep-flatten during permissions testing

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

rbd: snap list should open image as read-only

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

Merge remote-tracking branch 'gh/jewel'

Merge pull request #7243 from tchaikov/wip-py3-jewel

ceph-detect-init: fix py3 test

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

Merge pull request #7975 from JiYou/fix-config-opts

config: fix osd_crush_initial_weight

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

Merge pull request #8125 from dillaman/wip-librbd-mock

test: add missing shut_down mock method

test: add missing shut_down mock method

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

qa/workunits/rbd: handle exception thrown from close during lock test

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

RPM: fix openldap and openssl build dependencies for SUSE

http://tracker.ceph.com/issues/15138 Fixes: #15138

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

rbd: clone operation should default to image format 2

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

Merge pull request #8116 from SUSE/wip-docdev-nuke

doc/dev: add section on interrupting a running suite

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

doc/dev: add section on interrupting a running suite

This commit adds a new section, entitled "Interrupt a running suite", to
the "Testing in the cloud" chapter.

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

Merge pull request #8105 from SUSE/wip-ceph-detect-init-tox

ceph-detect-init: add missing test case

Merge pull request #8088 from liewegas/wip-typo

osd/OSDMap: fix typo in summarize_mapping_stats

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

Merge pull request #8098 from liewegas/wip-fix-crush

unittest_osdmap: default crush tunables now firefly

Merge pull request #8089 from liewegas/wip-mark-pg-stale

mon/PGMonitor: reliably mark PGs state

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

Merge pull request #7943 from llua/init-ceph

init-ceph.in: allow case-insensitive true in `osd crush update on start'

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Piotr Dałek <piotr.dalek@ts.fujitsu.com>

Merge pull request #8055 from liewegas/wip-hobject

ghobject_t: use # instead of ! as a separator

Reviewed-by: Piotr Dałek <piotr.dalek@ts.fujitsu.com>

Merge pull request #8056 from rjfd/wip-13296

rbd: support for enabling/disabling mirroring on specific images

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

qa/workunits/rados/test.sh: test tmap_migrate

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

Merge pull request #7971 from ceph/wip-selinux-update

selinux: Update policy to grant additional access

Merge pull request #8033 from liewegas/wip-pg-create

osd: handle dup pg_create that races with pg deletion

Reviewed-by: Samuel Just <sjust@redhat.com>

Merge pull request #8054 from ErwanAliasr1/evelu-check

common: SubProcess: Avoid buffer corruption when calling err()

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

Merge pull request #8057 from liewegas/wip-pglog-warning

osd/PGLog: fix warning

Reviewed-by: Samuel Just <sjust@redhat.com>

Merge pull request #8059 from ceph/wip-include-scope

rados: add ceph:: namespace to bufferlist type

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

Merge pull request #8071 from xiexingguo/xxg-wip-fixptr

osd: initialize last_recalibrate field at construction

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

Merge pull request #8081 from renhwsky/renhw-wip-osdmonitor-poolset

osd: min_write_recency_for_promote & min_read_recency_for_promote are tiering only

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

test: fixup and improvements for rbd-mirror test

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

Merge pull request #7879 from xiexingguo/xxg-wip-doc-rados-api

doc/rados/api/librados-intro.rst: fix typo

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

doc: fix typo

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

Merge pull request #8079 from dillaman/wip-14413

rbd-mirror: integrate with image sync state machine

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

test: remove broken negative test cases

These should be reimplemented using google mock instead of
virtual functions.

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

rbd-mirror: integrate new bootstrap state machine

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

rbd-mirror: simple image bootstrap state machine

This state machine will handle the simple cases of creating
a local image from a remote image, registering to the remote
journal, and sync'ing the image contents.

There are several TODOs for future remaining work.

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

rbd-mirror: helper state machine for opening local image

This state machine will open a local image and request the
exclusive lock.  If the open or lock fails, it will automatically
close the image.

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

rbd-mirror: helper state machine for closing librbd images

librbd ImageCtx's cannot be deleted from within the librbd thread.  This
state machine will perform the deletion from the rbd-mirror work queue
thread.

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

Merge pull request #7979 from dillaman/wip-14413

rbd-mirror: remote to local cluster image sync

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

Merge pull request #8102 from dillaman/wip-librados-aio-notify-redux

librados: cancel aio notification linger op upon completion

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

Merge pull request #8099 from dillaman/wip-15121

cls_rbd: protect against excessively large object maps

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

ceph-detect-init: add test for squeeze

Since we return 'sysvinit' for wheezy and squeeze only, make sure we are
testing both of these.

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

Merge pull request #8100 from linuxbox2/ldap-cmake

cmake: avoid false-positive LDAP header detect

Reviewed-by: Orit Wasserman <owasserm@redhat.com>

Merge pull request #8104 from dillaman/wip-rbd-read-flags

qa/workunits/rbd: do not use object map during read flag testing

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

qa/workunits/rbd: do not use object map during read flag testing

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

librados: cancel aio notification linger op upon completion

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

test: cmake: Fix make check compilation error

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

rbd-mirroring: test: Added mirror image enable/disable to RBD CLI syntax tests

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

cmake: avoid false-positive LDAP header detect

Pre-setting a value in OPENLDAP_INCLUDE_DIR broke the subsequent
test.

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

cls_rbd: protect against excessively large object maps

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

rbd: rbd-mirroring: Added mirroing info to image info command in RBD CLI

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

rbd: rbd-mirroring: Support image mirroring state retrieval in librbd

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

rbd: rbd-mirroring: Added mirror image enable/disable commands to RBD CLI

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

rbd: rbd-mirroring: Support mirroring image disable in librbd

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

rbd: rbd-mirroring: Support mirroring image enable in librbd

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

Merge pull request #8094 from dillaman/wip-librbd-image-watch-unregister

librbd: handle unregistering the image watcher when disconnected

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

ceph_test_rados_api_tmap_migrate: fix warning

In file included from ./test/librados/TestCase.h:9:0,
                 from test/librados/tmap_migrate.cc:4:
../src/gmock/gtest/include/gtest/gtest.h: In instantiation of ‘testing::Asserti$
../src/gmock/gtest/include/gtest/gtest.h:1484:23:   required from ‘static testi$
test/librados/tmap_migrate.cc:56:3:   required from here
../src/gmock/gtest/include/gtest/gtest.h:1448:16: warning: comparison between s$
   if (expected == actual) {
                ^

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

ceph_test_rados_api_list: fix warning

In file included from ./test/librados/TestCase.h:9:0,
                 from test/librados/list.cc:7:
../src/gmock/gtest/include/gtest/gtest.h: In instantiation of ‘testing::Asserti$
../src/gmock/gtest/include/gtest/gtest.h:1484:23:   required from ‘static testi$
test/librados/list.cc:944:5:   required from here
../src/gmock/gtest/include/gtest/gtest.h:1448:16: warning: comparison between s$
   if (expected == actual) {
                ^

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

unittest_osdmap: default crush tunables now firefly

This should have been changed in
000344ef0ca639d515e3f89401bafc9b0b13deda.

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

log: do not pass negative fd to fchown

>>>     CID 1355574:  Error handling issues  (NEGATIVE_RETURNS)
>>>     "this->m_fd" is passed to a parameter that cannot be negative.

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

librbd: handle unregistering the image watcher when disconnected

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

mon/PGMonitor: make pg refresh debug output more informative

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

mon/PGMap: drop unused nocreating flag for stat_pg_{add,sub}

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

osd: drop create events based on same_primary_since, not interval

Creates are resent when the primary changes, not the interval.
Ensure we don't drop something we shouldn't.

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

osd: drop unused primary arg to handle_pg_peering_evt

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

osd: use handle_pg_peering_evt for pg creations

This ensures we captures all of the PG resurrection logic.

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

mon/PGMonitor: reliably mark PGs state

In beb99d708a5051405a32f46fc10cef473bfddce3 we partially addressed
the case where a acting_primary update raced with an attemp to
mark the pg state.  However, if the acting_primary changed, we
didn't check the new acting_primary to ensure that it is also
down and we should still mark things stale.

Also, printing out the acting_primary aids debugging.

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

Merge pull request #7913 from liewegas/wip-list-encode

include/encoding: do not try to be clever with list encoding

Merge pull request #7915 from ceph/wip-librados-stat2

librados: stat2 with higher time precision

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

Merge pull request #7964 from liewegas/wip-crush-jewel

crush: update tunable docs.  change default profile to jewel

Reviewed-by: Samuel Just <sjust@redhat.com>

Merge pull request #8035 from liewegas/wip-bluestore

osd: bluestore updates, scrub fixes

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

Merge pull request #8050 from liewegas/wip-15077

os/filestore: fix punch hole usage in _zero

Reviewed-by: Samuel Just <sjust@redhat.com>

Merge pull request #8064 from liewegas/wip-zlib-test

unittest_compression_zlib: do not assume buffer will be null terminated

Merge pull request #7870 from stiopaa1/blueStoreRemoveIncludes

osd: bluestore: remove unneeded includes

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

Merge pull request #7871 from xiexingguo/xxg-wip-cleanasync

msg: async: small cleanups

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

osd/OSDMap: fix typo in summarize_mapping_stats

From ea9abe53d0e777b7dc3b22af71639f77c4de08c8

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

SubProcess: Avoid buffer corruption when calling err()

Some code like crush/CrushTester.cc, uses err() to get the output status of a
spawned command.

As per reported in bug #15011, some tests were failing because of some utf8
decoding issues. The implied buffers were generated by the output of err()
function of SubProcess.

err() is returning the str().c_str() value of 'errstr' object which is not
living much longer that the function itself.

This patch returns a std::string to avoid the temporary allocation and fixes
the associated err() calls accordingly.

Since this commit, the make check is now passing everytime.

Fixes: #15011
Signed-off-by: Erwan Velu <erwan@redhat.com>

Merge pull request #7170 from trociny/wip-freebsd-misc

FreeBSD related fixes

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

Merge pull request #7947 from saru95/patch---2

ceph.in: Minor python3 specific changes

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

Merge pull request #7974 from tchaikov/wip-buffer-eq-neq

buffer: add symmetry operator==() and operator!=()

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

osd: min_write_recency_for_promote & min_read_recency_for_promote are only used in cache pool

min_write_recency_for_promote & min_read_recency_for_promote are only used in cache pool

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

doc: add doc for osd_crush_initial_weight

Signed-off-by: You Ji <jiyou09@gmail.com>

Merge pull request #8074 from tchaikov/wip-ceph-detect-init-test

ceph-detect-init: add debian/jessie test

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

ceph-detect-init: return None at seeing unknown debian distro

* return None at seeing unknown debian distros
* add test for this accordingly

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

Merge pull request #8046 from xiexingguo/xxg-wip-fixpc

msg: async: fix perf counter description and simplify _send_keepalive_or_ack

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

Merge pull request #7949 from wjin/fix

Event: fix clock skew problem

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

Merge pull request #8076 from ceph/wip-rgw-ldap

Wip rgw ldap

This follows a revert of the previous PR. This branch has some build related fixes.

Merge pull request #8075 from ceph/revert-7985-rgw-token-7

Revert "rgw ldap"

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

Revert "rgw ldap"

test: verify proper update of object map during rbd-mirror image sync

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

rbd-mirror: update object map while performing image sync

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

rbd-mirror: temporarily disable support for cloned images

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

test: unit test cases for rbd mirror image sync

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

rbd-mirror: image sync state machine

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