Merge pull request #8545 from xiexingguo/xxg-wip-lfn

os/filestore: fix return type mismatch for lfn parse

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

Merge pull request #8555 from avnerbh/fixes_no_3

msg/xio: simple fixes

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

Merge pull request #8570 from xiexingguo/xxg-wip-scrub

osd: clear requeue_scrub_on_unblock flag after requeue scrub

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

Merge pull request #8586 from liewegas/wip-15441

osd: fix watch reconnect race

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

Merge pull request #8619 from yehudasa/wip-rgw-jewel-fixes

rgw: fix binfo_cache, RGWShardCollectCR

Merge pull request #8281 from theanalyst/doc/multisite-rgw

doc: rgw adding a very basic multisite doc

doc: add multisite to index

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

doc: rgw multisite documentation

Adding basic documentation for new multisite features, with an example
showing 3 zones in a zonegroup.

Fixes: http://tracker.ceph.com/issues/15247
Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>

rgw: binfo_cache is now a RGWRados member

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

rgw: RGWShardCollectCR does not need a cct member

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

Merge pull request #7912 from ceph/wip-cmake-make-check

Wip cmake make check

Merge pull request #8614 from liewegas/wip-fsmap-underscore

mds/FSMap: use _ in key name

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

Merge pull request #8615 from theanalyst/fix-mailmap-self

mailmap: Abhishek Lekshmanan affiliation

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

mailmap: Abhishek Lekshmanan affiliation

Adding an entry to normalize the personal email id and work email id
Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>

mds/FSMap: use _ in key name

No space or else it isn't valid XML.

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

Merge pull request #8608 from swamireddy/contrib_list_10.1.2

mailmap update

Reviewed-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
Reviewed-by: Loic Dachary <ldachary@redhat.com>

mailmap: Jenkins name normalization

Signed-off-by: M Ranga Swami Reddy <swamireddy@gmail.com>

mailmap: Abhishek Lekshmanan name normalization

Signed-off-by: M Ranga Swami Reddy <swamireddy@gmail.com>

mailmap: Wei Qiaomiao affiliation

Signed-off-by: M Ranga Swami Reddy <swamireddy@gmail.com>

mailmap: Luo Runbing affiliation

Signed-off-by: M Ranga Swami Reddy <swamireddy@gmail.com>

cmake: link ceph_test_rados_api_list against libglobal

see 769c0aff

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

cmake: Add cython_modules to `make check`

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

cmake: remove repeat OSD.cc

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

cmake: CMake environment variables added to automake

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

cmake: Building ceph-detect-init from source code

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

cmake: Building ceph-disk from source code

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

cmake: Add librgw_file tests

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

cmake: Added rbd_mirror targets

Added rbd_mirror libraries, unit tests, executables

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

cmake: Added an absolute path for libs

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

cmake: test_pidfile.sh test passing

Replaced relative paths in test_pidfile.sh
with CEPH_VAR environment variables set in cmake.

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

cmake: Protect againist getenv returning nullptr

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

cmake: erasure-decode-non-regression.sh passing

Added missing dependencies and link libraries for
erasure-decode-non-regression.sh and added absolute
paths to ceph_erasure_code_non_regression.cc.

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

unittest_journal: got rid of relative paths

Replaced .libs in TestClassHandler.cc with CEPH_LIB

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

unittest_blkdev: absolute path for cmake make check

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

cmake: test_objectstore_memstore.sh test passing

Replaced relative paths in test_objectstore_memstore.sh
with CEPH_VAR environment variables set in cmake.

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

cmake: erasure-code tests passing

Replaced relative paths in test-erausure-eio.sh
test-erasure-code.sh, and replaced .libs in
erasure_code unittests with CEPH_VAR environment
variables set in cmake.

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

cmake: ceph_objectstore_tool.py test passing

Replaced relative paths in shell scripts in
test/ceph_objectstore_tool.py and init-ceph.in to
work with CEPH_FOO environment variables set in cmake.
Also added CEPH_BUILD_DIR environment variable set
to CMAKE_BINARY_DIR. It is used in init-ceph and
ceph_objectstore_tool.py.

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

cmake: unittest_bufferlist passing in cmake

Replaced relative paths in unittest_bufferlist.sh
to work with CEPH_FOO environment variables set in
cmake.

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

cmake: cephtool-test-rados/mds/osd passing in cmake

Replaced relative paths in test/cephtool-test-mon.sh,
qa/workunits/cephtool/test.sh, and test/cephtool-test-mon.sh
to work with CEPH_FOO environment variables set in cmake.

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

cmake: working on cephtool-test-rados.sh test

Replaced relative paths in test/cephtool-test-rados.sh,
qa/workunits/rados/test_rados_tool.sh,
src/test/vstart_wrapper.sh, with CEPH_FOO environment
variables set in cmake. Also edited the CMake path
finding logic in vstart.sh with the CEPH_FOO variables.

NOTE: test is not passing yet, possibly due to the
filesystem. this commit is a work in progress

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

cmake: working on rados-striper.sh test

Replaced relative paths in test/mon/osd-crush.sh
with CEPH_VAR environment variables set in cmake.

NOTE: test is not passing yet, possibly due to the
filesystem. this commit is a work in progress

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

cmake: librbd fixes

Added src/librbd and test/librbd CMakeLists.txt's,
various previously missing libraries and targets,
revised unittest_librbd.

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

cmake: moved tests into test/system dir

Added a CMakeLists.txt into test/system.

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

cmake: moved tests into test/rgw dir

Added a CMakeLists.txt into test/rgw.

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

cmake: moved tests into test/osdc dir

Added a CMakeLists.txt into test/osdc.

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

cmake: moved tests into test/ObjectMap dir

Added a CMakeLists.txt into test/ObjectMap.

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

cmake: moved tests into test/msgr dir

Added a CMakeLists.txt into test/msgr.

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

cmake: moved tests into test/messenger dir

Added a CMakeLists.txt into test/messenger.

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

cmake: moved tests into test/librados_test_stub dir

Added a CMakeLists.txt into test/librados_test_stub.

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

cmake: moved tests into test/libcephfs dir

Added a CMakeLists.txt into test/libcephfs.

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

cmake: moved tests into test/journal dir

Added a CMakeLists.txt into test/journal.

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

cmake: moved tests into test/filestore dir

Added a CMakeLists.txt into test/filestore.

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

cmake: moved tests into test/compressor dir

Added a CMakeLists.txt into test/compressor,
libcompressor to src/compressor/CMakeLists.txt,
added absolute path into $snappy_sources, removed
.libs from compressor unit test source files

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

cmake: moved tests into test/cls_version dir

Added a CMakeLists.txt into test/cls_version.

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

cmake: moved tests into test/cls_statelog dir

Added a CMakeLists.txt into test/cls_statelog.

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

cmake: moved tests into test/cls_rgw dir

Added a CMakeLists.txt into test/cls_rgw.

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

cmake: moved tests into test/cls_replica_log dir

Added a CMakeLists.txt into test/cls_replica_log.

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

cmake: moved tests into test/cls_refcount dir

Added a CMakeLists.txt into test/cls_refcount.

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

cmake: moved tests into test/cls_rbd dir

Added a CMakeLists.txt into test/cls_rbd.

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

cmake: moved tests into test/cls_numops dir

Added a CMakeLists.txt into test/cls_numops.

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

cmake: moved tests into test/cls_log dir

Added a CMakeLists.txt into test/cls_log.

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

cmake: moved tests into test/cls_lock dir

Added a CMakeLists.txt into test/cls_lock.

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

cmake: moved tests into test/cls_hello dir

Added a CMakeLists.txt into test/cls_hello.

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

cmake: moved tests into test/bench dir

Added a CMakeLists.txt into test/bench.

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

cmake: moved tests into test/os dir

Added a CMakeLists.txt into test/os.

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

cmake: moved tests into test/pybind dir

Added a CMakeLists.txt into test/pybind. Added
CEPH_BIN in front of relative path in
test_ceph_argparse.py.

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

cmake: moved tests into test/objectstore dir

Added a CMakeLists.txt into test/objectstore.

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

cmake: moved tests into test/mds dir

Added a CMakeLists.txt into test/mds.

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

cmake: moved tests into test/libradosstriper dir

Added a CMakeLists.txt into test/libradosstriper.

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

cmake: moved tests into test/librados dir

Added a CMakeLists.txt into test/librados.

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

cmake: moved tests into test/fs dir

Added a CMakeLists.txt into test/fs.

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

cmake: moved tests into test/crush dir

Added a CMakeLists.txt into test/crush.

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

cmake: moved tests into test/common dir

Added a CMakeLists.txt into test/common.

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

cmake: shell scripts in test/encoding passing in cmake

Replaced relative paths in scripts in test/encoding
to work with CEPH_FOO environment variables set in
cmake, CMakeLists.txt added.

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

cmake: shell scripts in test/mon passing in cmake

Replaced relative paths in shell scripts in test/mon
to work with CEPH_FOO environment variables set in
cmake, added CMakelists.txt to test/mon

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

cmake: moved tests into test/osd dir

Replaced relative paths in shell scripts in test/osd
directory with CEPH_VAR environment variables set in cmake,
added a CMakeLists.txt in test/osd.

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

cmake: encode-decode-non-regression.sh passing in cmake

Replaced relative paths in encode-decode-non-regression.sh
to work with CEPH_FOO environment variables set in
cmake.

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

cmake: test-ceph-helpers working

Moved all the libraries in CMAKE_BINARY_DIR/lib
and all the binaries in CMAKE_BINARY_DIR/bin. Set
various environment variables for test-ceph-helpers.
Put those variables throughout
qa/workunits/ceph-helpers.sh.

NOTE: This is a very rough draft of these fixes.

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

cmake: Reorganized test dir, added cmake functions

make check targets now use add_ceph_test, or
add_ceph_unittest to be added to CTest. Renamed and
reordered targets in tests/CMakeLists.txt

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

Merge pull request #8606 from dillaman/wip-15457

rbd: loosen image spec validation requirements

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

Merge pull request #8603 from rmechler/wip-15362

pybind/rados: fix omap method return values

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

release-notes: document rbd cli name validation override

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

rbd: fail if cannot extract spec from legacy "--image" optional

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

rbd: optionally disable spec validation when creating images/snapshots

Setting the "rbd-validate-names" config propery to false will disable
spec validation.

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

rbd: add support for relaxed image spec validation

Operations which create images or snapshots still fully enforce
the spec validation.  All other operations use a relaxed validation
format.

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

common: new rbd image spec validation option

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

Removed parentheses for if statement.

Signed-off-by: Roland Mechler <rmechler@cisco.com>

Merge pull request #8588 from yehudasa/wip-rgw-period-id

rgw: try to use current period id in a few more cases

Merge pull request #8566 from cbodley/wip-rgw-period-reflect

rgw: RGWPeriod::reflect() sets master zonegroup as default
Reviewed-by: Orit Wasserman<owasserm@redhat.com>

update release-notes manually

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

Merge pull request #8585 from cbodley/wip-rgw-reload-usage

rgw: call rgw_log_usage_finalize() on reconfiguration

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

msg/simple/DispatchQueue: inject internal delays in special event dispatch

E.g., connection reset.  This will help uncover subtle races.

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

Merge pull request #8600 from liewegas/wip-rados-lfn

ceph_test_rados: make long name ~300 chars, (not ~800)

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

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

mds: FSmap decode fix

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

Merge pull request #8565 from dillaman/wip-15471

librbd: fix handling of proxied maintenance operations during shut down

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

librbd: do not return a failure if a peer cannot be notified of updateReviewed-by: Josh Durgin <jdurgin@redhat.com>

librbd: do not return a failure if a peer cannot be notified of update

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

Merge pull request #8511 from dillaman/wip-15436

librbd: IO deadlock when dynamically enabling/disabling features

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

Merge pull request #8494 from dillaman/wip-15352

journal: possible race condition during live replay

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

Fixes for python omap method return values.

Signed-off-by: Roland Mechler <rmechler@cisco.com>

FSMap: guard the ever_enabled_multiple decode

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