Merge pull request #10025 from tchaikov/wip-cmake

cmake: install ceph_test_cls_rgw

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

Merge pull request #9745 from weiqiaomiao/wqm-wip-rgw-usage

rgw:add missing "--staging" to radosgw-admin usage

lgtm (build verified f23)

debian: package etc/init.d/ceph in ceph-base

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

Merge pull request #9606 from gregsfortytwo/wip-16002

ObjectCacher: fix bh_read_finish offset logic

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

cmake: install ceph_test_cls_rgw

it is used by cls/test_cls_rgw.sh

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

Merge pull request #9754 from dx9/wip-fix-rgw-include

rgw/rgw_http_client: add compat.h include for TEMP_FAILURE_RETRY

lgtm (build verified, f23)

Merge pull request #9994 from xiexingguo/xxg-wip-kill-client-warn

client: kill compiling warning

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

Merge pull request #9831 from linuxbox2/wip-ssl3

cmake: rework NSS and SSL

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

Merge pull request #9807 from Yan-waller/yj-wip-rgwtoolsadderrnostr

rgw: ext_mime_map_init add string describing for error number

lgtm  (build verified)

automake, ssl:  real openssl detection, fix ssl linkage w/NSS

This change mainly intends to prevent linking with libssl when the
crypto provider is NSS, which provides an SSL implementation (the
implementation we must use and prefer when NSS is selected).

Secondarily, actually detect openssl when it is selected, which
happens by default and co-selects with cryptopp.  To do this, we
import the ax_check_openssl.m4 from the automake archive.

Since upstream builds now prefer NSS crypto, make this the default.

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

cmake: rework NSS and SSL

The cmake build should select NSS or CryptoPP consistently with
current autoconf logic, as used in our RHEL builds (-DWITH_NSS),
and the SSL linkage must match (for NSS, -lssl3).

With this change, there is no direct linkage with libssl when NSS
is selected (I still see indirect linkage via libcurl, in turn
via libssh2, looking into that).

With guidance from upstream and downstream, NSS builds are now
selected by default.

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

Merge pull request #9851 from cbodley/wip-rgw-tombstone-pgver

rgw: add pg_ver to tombstone_cache

Merge pull request #9995 from tchaikov/wip-cmake

cmake changes

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

cmake: build install libcls_numops

test_cls_numops uses it.

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

cmake: install ceph_test_filestore_idempotent_sequence

run_seed_to.sh in task "filestore_idempotent" uses it

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

cmake: use full path for substitution and definitions

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

cmake: use CMAKE_POSITION_INDEPENDENT_CODE property instead of -fPIC

use the global setting of CMAKE_POSITION_INDEPENDENT_CODE instead of
hardwiring the CMAKE_C_FLAGS with -fPIC. this helps to reduce the
overhead of symbol resolution when user is using static libraries.
see
https://cmake.org/cmake/help/v2.8.11/cmake.html#variable:CMAKE_POSITION_INDEPENDENT_CODE

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

cmake: move librados.cc out of libradosstriper

NObjectIterator::__EndObjectIterator is a static member variable
whose destructor deletes a pointer. librados.cc is the source file that
defines __EndObjectIterator. before this change rados cli is linked
against libradosstriper and librados. both of them include librados.cc.
that's why the dtor is called twice, hence double free when the dso
is closed and the static variables are destructed. in this change,
the librados.cc is moved out of libradosstriper, RadosClient.cc,
RadosXattrIter.cc and IoCtxImpl.cc kept as the OBJECT library, as
libradostriper is accessing the non-public symbols defined by them.

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

run-make-check.sh: modprobe won't work on containers; not needed

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

debian/rules: specify sysconf dir explicitly

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

CMakeLists: nss only, ignore cryptopp

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

debian/rules: build deb with cmake

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

Merge branch 'kraken'

debian/rules: package in a more debhelper way

this helps to keep the build rule simpler, and easier to customize

* -j$(NUMJOBS) is taken care of by 'dh --parallel'
* use 'autoreconf' dh add-on to autoconf cleanup
* add dh-autoreconf to Build-Depends
* bump debhelper compatibility level to 8, as jewel's supported
  debian based distro is jessie (with debhelper 9.20150101),
  ubuntu trusty (with debhelper 9.20131227ubuntu1)

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

client: kill compiling warning

The 'done' lable is not appliable any more.

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

Merge pull request #9992 from yuyuyu101/wip-fix-rebase

msg/async: add "queue_reset" argument

this fixes the broken build

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

msg/async: add "queue_reset" argument

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

Merge pull request #9991 from stiopaa1/msg_asyncmess_moveCProcessorAccept_class

msg/AsyncMessenger: move C_processor_accept class

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

Merge pull request #9783 from yuyuyu101/wip-16366

msg/async: Support close idle connection feature

Revert "msg/AsyncMessenger: move Worker class to cc file"

This reverts commit 23d4488e376de8f1a5c369365d91021ee8c9a324.

msg/async/Event: change to use pthread_t to indicate whether the same thread

thread_local has problem in TmapMigratePP.DataScan case that it will be
assigned to zero unexpectedly.

pthread_t is much cheaper than gettid since it's a library implementation.

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

msg/async/AsyncConnection: avoid dup RETRYGLOBAL sending

if two accept all going to dispatch RETRYGLOBAL sending, it will cause
invalid connect side receiver.

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

msg/async/Event: don't execute inline if nonwait

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

Event: change submit_to related to cephcontext

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

Event: avoid multi global conflict

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

AsyncMessenger: remove extra release_worker path

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

AsyncConnection: ensure delay_state empty when building a new session

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

AsyncConnection: make delete_time_event async

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

perf_local: fix api adjust

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

Event: change id to idx

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

AsyncConnection: execute existing fault in another

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

Event: add submit_to apis

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

AsyncConnection: add EventCenter id

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

AsyncConnection: move delete timers to cleanup handler

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

test_msgr: add connection read timeout tests

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

AsyncConnection: add tick timer

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

test_async_driver: add missing headers

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

AsyncConnection: make connection timeout when idle a lot

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

Event: implement effective delete_time_event

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

Event: remove next_time which isn't needed

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

Event: remove extra header files

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

Event: replace Mutex with c++ mutex

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

Event: replace atomic_t with c++ atomic

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

Event: remove time_lock which is no need

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

Event: use local_center instead of pthread id

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

Event: remove clock skew detect since we use mono clock now

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

Event: use multimap instead of map

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

Merge pull request #9781 from yuyuyu101/wip-epoll

msg/async: harden error logic handle

Merge pull request #9990 from dillaman/wip-rbd-mirror-cmake

cmake: fix unittest_rbd_mirror failures under non-optimized builds

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

Merge pull request #9794 from xiexingguo/xxg-wip-fix-libcephfs

libcephfs: fix portability-related error settings

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

Merge pull request #9835 from dx9/wip-client-accessperms

client: added def for ACCESSPERMS when undefined

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

Merge pull request #9884 from david-z/wip-fix-async-msg-shutdown

mds: fix shutting down mds timed-out due to deadlock

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

Merge pull request #9809 from xiexingguo/xxg-wip-fix-fuse-ll

fuse_ll: fix incorrect error settings of fuse_ll_mkdir()

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

Merge pull request #9803 from xiexingguo/xxg-wip-fix-client_hexscope

client: fast abort if underlying statsf() call failed; end scope of std::hex properly

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

Merge pull request #9793 from xiexingguo/xxg-wip-client-mr

client: fix access violation

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

Merge pull request #9774 from xiexingguo/xxg-wip-client_dupmdsmap

client: discard mds map if it is identical to ours

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

Merge pull request #9773 from xiexingguo/xxg-wip-cinode_finleak

mds/CInode: fix potential fin hanging

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

Merge pull request #9769 from ukernel/wip-16358

mds: fix Session::check_access()

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

test: fix CMake build of ceph_test_objectcacher_stress

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

msg/AsyncMessenger: move C_processor_accept class

Move C_processor_accept class to cc file.

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

test: ensure unique template specializations per test case

With optimizations disabled, there can be cross translation unit
symbol leaking that is not present when inlining is enabled.

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

test: missing template specialization for unittest_rbd_mirror

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

cmake: add missing cls object dependencies

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

Merge pull request #9975 from ceph/wip-cmake

cmake changes

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

Merge pull request #9986 from liewegas/wip-make-dist

make-dist: generate ceph.spec

Reviewed-by: Dan Mick <dmick@redhat.com>

Merge pull request #9964 from dillaman/wip-16491

rbd-mirror: 'wait_for_scheduled_deletion' callback might deadlock

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

v11.0.0

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

make-dist: generate ceph.spec

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

Merge pull request #9889 from Yan-waller/yj-wip-rgwbucketcc

rgw: add string describing for error number

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

Merge pull request #9888 from weiqiaomiao/wqm-wip-clean-swiftapi

rgw: duplicate check for acl op in RGWHandler_REST_Bucket_SWIFT::op_get()

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

Merge pull request #9854 from Yan-waller/yj-wip-rgwunlinkbucket

rgw: remove unused bufferlist variable

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

Merge pull request #9822 from Yan-waller/yj-wiph-rgwfixinitwatch

rgw: fix the missing return value of init_watch

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

Merge pull request #9808 from Yan-waller/yj-wip-rgwtoolsinitreturn

rgw: add error return code checking for rgw_tools_init and rgw_perf_start

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

Merge pull request #9796 from Yan-waller/yj-wip-rgwremoveuser

rgw: miscellaneous cleanups

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

Merge pull request #9780 from theanalyst/rgw/create-bucket-cleanup

rgw_bucket: remove unused bufferlist

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

Merge pull request #9987 from jcsp/wip-cmake-fortify-source

cmake: fix FORTIFY_SOURCE check

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

cmake: fix FORTIFY_SOURCE check

This got broken in 6f3e3cf6.  The -Werror part wasn't
having the desired effect, so we were enabling FORTIFY_SOURCE
even when in -O0

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

msg/async/AsyncMessenger: make sure all connections closed then shutdown dq

1. ensure stop accepter before shutdown dispatcherqueue
2. ensure we don't generate new item after dispatcher queue shutdown

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

msg/async: keep out_seq inc/dec with sent messages

Partial revert 84b9088e164b39919065194831455e441a06ef85
Signed-off-by: Haomai Wang <haomai@xsky.com>

msg/async/AsyncConnection: handle send buffer overflow case

It's rare happen in real env, because each socket has enough write buffer
to store a little handshake info.

Just harden the current codes

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

msg/async: Consolidate accept error handle

The original logic is from
https://github.com/ceph/ceph/commit/ba140b5a6d1bafe7f953819f682758ab552edfd4
I think it doesn't make sense in detail errno case.

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

msg/async/Epoll: make sure error event can be handle

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

Merge pull request #9984 from tchaikov/wip-fix-test_crush_bucket.sh

test/test_crush_bucket.sh: source detect-build-env-vars.sh for settin…

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

Merge pull request #9771 from yuyuyu101/wip-async-priority

msg/async: set socket priority for heartbeat socket

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

qa/workunits/rbd: remove temporary image exports

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

rbd-mirror: fix potential image replayer state transition race

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

rbd-mirror: cancel image deletion callback on shut down

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

rbd-mirror: fixed potential leaking image deletion context callback

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

rbd-mirror: ImageReplayer doesn't need image deleted callback

The Replayer will detect that the ImageReplayer is stopped and will
schedule the "wait for deleted" callback before attempting to
restart the ImageReplayer.

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

rbd-mirror: use async callback when deletion not in-progress

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