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>

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>

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>

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"

Merge pull request #8066 from yehudasa/wip-rgw-swift-versioning-disabled

Wip rgw swift versioning disabled

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

Merge pull request #7985 from linuxbox2/rgw-token-7

rgw ldap (Matt Benjamin)

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

Merge remote-tracking branch 'origin/master' into wip-rgw-ldap

test: disable test_rgw_ldap

for now

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

rgw/Makefile.am: add a missing .h file

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

rgw_ldap:  merge cleanups

* match LDAPHelper op return codes to RGW (-POSIX)
* make temporary LDAP handle local (MT-safe)
* add required --encode and --ttype to usage
* use versioned encoding macros

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

rgw: require openldap library client headers

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

rgw: free components on shutdown

Also, use ldout in rgw_file.h in 3 places.

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

rgw: LDAP pass-through authentication

Implement a new external authenticator based on LDAP and the
new external token format.

External LDAP auth now works, at least with openldap/X.500 style
naming and ldaps:// (SSL).

The latter is AD-friendly, but since AD uses dnattr=cn (IIRC)
everywhere, AD will need testing.

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

Merge remote-tracking branch 'gh/jewel'

Merge branch 'wip-15086' of git://github.com/SUSE/ceph

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

Merge pull request #8068 from SUSE/wip-15104

qa/workunits/rbd: use POSIX function definition

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

Merge pull request #7663 from javacruft/wip-pybind-flags

pybind: Ensure correct python flags are passed

Reviewed-by: Boris Ranto <branto@redhat.com>
Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>

Merge pull request #7856 from jdurgin/wip-cython-cleanup

configure.ac: update help strings for cython

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

Merge remote-tracking branch 'origin/wip-josh-testing'

Merge pull request #8067 from athanatos/wip-fix-filestore-warning

FileStore: fix initialization order for m_disable_wbthrottle

Reviewed-by: Greg Farnum <gfarnum@redhat.com>

qa/workunits/rbd: use POSIX function definition

In scripts with /bin/sh shebang, we must use POSIX function definitions to
avoid syntax errors on platforms that link /bin/sh to something other than
/bin/bash.

See https://wiki.ubuntu.com/DashAsBinSh#function for more information.

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

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

rgw: disable swift versioning by default

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

rgw: improve naming of Swift versioned object's copies.

Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>

rgw: dump X-Versions-Location HTTP header of Swift API.

Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>

rgw: copy swift versioned object to destination if overwritten

Only allow if target bucket owner is the source bucket owner.

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

rgw: swift object versioning data structure changes

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

Merge pull request #8034 from SUSE/wip-15047

packaging: make infernalis -> jewel upgrade work

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

debian: make infernalis -> jewel upgrade work

Attempts to install jewel ceph-common, ceph-mon, ceph-osd, and ceph-base
package over infernalis ceph package fail due to files existing in both.

See comment #4 in the tracker issue for a deeper analysis.

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

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

FileStore: fix initialization order for m_disable_wbthrottle

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

ceph-detect-init: return systemd on Debian Jessie

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

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

Revert "test/time: no need to abs(uint64_t) for comparing"

This reverts commit da0f6608dd6cc3356e727e739575f496c2b6a590.

unittest_time fails:

[==========] Running 4 tests from 2 test cases.
[----------] Global test environment set-up.
[----------] 2 tests from RealClock
[ RUN      ] RealClock.Sanity
[       OK ] RealClock.Sanity (0 ms)
[ RUN      ] RealClock.Conversions
test/common/test_time.cc:125: Failure
Expected: ((Clock::from_double(bd) - brt).count()) < (30U), actual: 18446744073709551595 vs 30
[  FAILED  ] RealClock.Conversions (0 ms)
[----------] 2 tests from RealClock (0 ms total)

[----------] 2 tests from CoarseRealClock
[ RUN      ] CoarseRealClock.Sanity
[       OK ] CoarseRealClock.Sanity (0 ms)
[ RUN      ] CoarseRealClock.Conversions
test/common/test_time.cc:125: Failure
Expected: ((Clock::from_double(bd) - brt).count()) < (30U), actual: 18446744073709551595 vs 30
[  FAILED  ] CoarseRealClock.Conversions (0 ms)
[----------] 2 tests from CoarseRealClock (0 ms total)

[----------] Global test environment tear-down
[==========] 4 tests from 2 test cases ran. (0 ms total)
[  PASSED  ] 2 tests.
[  FAILED  ] 2 tests, listed below:
[  FAILED  ] RealClock.Conversions
[  FAILED  ] CoarseRealClock.Conversions

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

unittest_compression_zlib: do not assume buffer will be null terminated

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

Merge pull request #8063 from gregsfortytwo/wip-fix-fsmap-decode

Wip fix fsmap decode

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

Merge pull request #7752 from somnathr/wip-odsync-write

FileStore: Added O_DSYNC write scheme

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

FSMap: actually include the legacy MDSMap in Filesystems when upgrading

Signed-off-by: Greg Farnum <gfarnum@redhat.com>

FSMap: decode old MDSMaps properly

We accidentally left a few members out that the MDSMap had!

Signed-off-by: Greg Farnum <gfarnum@redhat.com>

Merge pull request #8058 from yehudasa/wip-rgw-clean-log

cleanup

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

mon: make the minimum crush tunables configurable

If they cluster is using very old tunables, as inferred by whether it
requires a newer version of CRUSH, issue a health warning.

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

crush: report minimum_required_version when dumping tunables

This mimics the feature bit enforcement in OSDMap.cc but it does it based
on the version string.  This is useful when you have CRUSH tunables that
aren't mapped to a named profile.

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

rgw_ldap:  merge cleanups

* match LDAPHelper op return codes to RGW (-POSIX)
* make temporary LDAP handle local (MT-safe)
* add required --encode and --ttype to usage
* use versioned encoding macros

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

rgw: silence compilation warnings

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

rgw: cleanup of debug messages

use ldout instead of derr and lderr and increase logging level

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

Merge pull request #7944 from trociny/wip-rbd-mirror-image-replayer-async

rbd-mirror: ImageReplayer async start/stop

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

Merge pull request #8028 from dillaman/wip-librbd-journal-replay

librbd: replaying a journal op post-refresh requires locking

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

Merge pull request #7483 from liewegas/wip-osd-boot

osd: resolve boot vs NOUP set + clear race

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

Merge pull request #8030 from yehudasa/wip-rgw-sync-status

adds the radosgw-admin sync status command that gives a human readable status of the sync process at a specific zone

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

Merge pull request #7615 from ceph/wip-14678

rgw: store system object meta in cache when creating it

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

Merge pull request #8037 from yehudasa/wip-bucket-link

rgw:bucket link now set the bucket.instance acl (bug fix)

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

Merge pull request #8013 from yehudasa/wip-rgw-multisite-fixes

rgw multisite fixes

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

Merge pull request #6953 from jcsp/wip-fsmap

Multi-filesystem support

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

Merge pull request #7465 from liewegas/wip-promote-throttle

osd: probabilistic cache tier promotion throttling

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

Merge tag 'v10.0.5'

v10.0.5

Conflicts:
debian/changelog

v10.0.5

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

debian/changelog: Remove stray 'v' in version

Signed-off-by: Dan Mick <dan.mick@redhat.com>
(cherry picked from commit 0f7730c8f444657d4aaffa28c12bbcd602a2e3b8)

msg: async: improve _send_keepalive_or_ack() a little

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

msg: async: fix connection perf counter description

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

Merge branch 'master' of github.com:ceph/ceph

Merge branch 'debian-stretch-dep-fix' of git://github.com/rldleblanc/ceph

Reviewed-by: Sage Weil <sage@redhat.com>
# Conflicts:
# debian/control

os/filestore: add filestore_punch_hole = false option

Make punch hole usage optional.

Default to off, since it's relatively untested.

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

os/filestore: fix punch hole usage in _zero

If we punch a hole that extends past EOF, ObjectStore semantics are
that the file size is also extended.  Do that.

Note that this bug was hidden before because we weren't passing
KEEP_SIZE to fallocate until 7bd95b595fddb8a4e618a2c7df1ba04eccf0829d
and the fallocate was *always* failing with EOPNOTSUPP (making us fall
back to writing actual zeros).

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

Merge pull request #8045 from tchaikov/wip-scrubstore-cleanup

osd/ScrubStore: remove unused function

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

osd: use correct shard for temp scrub object

Use ghobject_t type throughout.  Make ghobject_t variant of
spg_t::make_temp_object().

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

os/bluestore: ref ovec for CLONE, CLONERANGE

This keeps ovec up to date.  Marginally more efficient.

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

os/bluestore: fix OP_TRY_RENAME

We don't need to create the dest onode.

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

os/bluestore: fix _rename

Update the *target* object ref in ovec.

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

ceph_test_objectstore: rename assumes target does not exist

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

os/memstore: assert src and dst collection match on rename

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

os/filestore: make read replace (not append) to result bl

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

ceph_test_objectstore: add a few checks to the rename test

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

os/bluestore/BlueStore: do not cow_rmw_tail at or past eof

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

os/bluestore: print debug on ENOTEMPTY

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

os/bluestore: make _do_omap_clear debug line pretty

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

include/buffer: make is_partial work on empty ptr

Add a few unit tests.

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

osd/ScrubStore: do not use temp collection

Temp collections are deprecated, and used only internally by
FileStore for compat reasons.

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

osd: simplify split vs backfill behavior

This is more future-proof, in case we add special backfill
completion work in the future.  In the worst case we will re-scan
the parent PG and find no changes.

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

Merge pull request #7707 from xiexingguo/xxg-wip-14815

osd: filestore: fix wrong scope of result code for error cases during mount

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

Merge pull request #7726 from tchaikov/wip-fix-ftbfs-gcc6

test/time: no need to abs(uint64_t) for comparing

Reviewed-by: Adam Emerson <aemerson@redhat.com>

Merge pull request #7955 from ErwanAliasr1/evelu-check-bufferlist

test/bufferlist: Avoid false-positive tests

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

Merge pull request #7980 from liewegas/wip-14952

mon: initialize last_* timestamps on new pgs to creation time

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

Merge pull request #7982 from liewegas/wip-14606

qa/workunits/rest/test.py: add confirmation to 'mds setmap'

Merge pull request #7983 from liewegas/wip-14616

log: do not repeat errors to stderr

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

Merge pull request #8004 from liewegas/wip-rados-test-stderr

qa/workunits/rados/test.sh: capture stderr too

Merge pull request #8006 from liewegas/wip-big-pages

os/bluestore/KernelDevice: force block size

Merge pull request #8019 from kmroz/wip-upstream-civetweb-low-ports-6

rgw: drop permissions of rgw/civetweb after startup

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

Merge pull request #8007 from wido/se-mirror-mail

mirrors: Change contact e-mail address for se.ceph.com

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