Merge pull request #19438 from cbodley/wip-qa-rgw-multisite-trim

qa/rgw: disable log trim in multisite suite

Merge pull request #19548 from tchaikov/mimic-gcc-7

build mimic-dev1 with gcc 7

Merge pull request #19542 from tchaikov/mimic-22093

qa: decrease the msg_inject_socket_failures from 1/500 to 1/1000

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

cmake: link libcommon with libstdc++ statically if WITH_STATIC_LIBSTDCXX

this matches the linkage of libceph-common, because valgrind reports
Leak_StillReachable if daemons are linked against libceph-common, will
link daemons against common instead, and let common link libstdc++
statically, if WITH_STATIC_LIBSTDCXX=ON.

this change also reverts e6695bb6

Fixes: http://tracker.ceph.com/issues/22438
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit df9a59894291fe81e727babb631fb0e23cd1bbb0)

cmake: link global-static against common

* as global-static references symbols offered by common.
* and remove DPDK_LIBRARIES from global, as it is libcommon which
  is using DPDK.

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit a2cad3bb1cad57cab5f0acc11310613077866a87)

cmake: link executables against ceph-common

so they can have access to libstdc++ if it is linked statically.

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit e6695bb63ace3c5ccb3398915e5af73decb4d9e7)

cmake: add WITH_STATIC_LIBSTDCXX option

to link libceph-common with libstdc++ if it is enabled.

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 4c2216de6a08f048374292a567dbabd083d64e87)

install-deps.sh: use tee for writing a file

because the stdout redirect is performed by current shell not `$SUDO
cat`, so $SUDO does not help here. use `$SUDO tee` instead, which is
able to read the stdin and write to the given file just as expected.

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 0beb846e57b94786e84c35927fe5ef3a67857fa3)

install-deps.sh: avoid re-installing g++-7

* add ubuntu-toolchain-r mirrors in case the ppa.launchpad.net is not
  accessible
* add ppa repo manually, it's faster than installing
  `software-properties-common` and then launch `add-apt-repository`
* hardwire $old to the gcc version shipped by the distro, simpler this
  way.

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit b69e3efe64159417b2c80894ba5c249eb470d80a)

install-deps.sh: use GCC-7 on xenial also

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 8a0935988fb845d0b88d97470b08e93a8709a03d)

install-deps.sh: install new gcc as the default the right way

* should install software-properties-common beforehand, otherwise
  the `add-apt-repository` command will not be available.
* the update-alternative commandline were copied from ceph-build,
  should remove the escape characters.

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 3882deae8c94802cfd49153ad2cf33f0a3dba60d)

install-deps.sh: enable testing repo on centos on aarch64

the DTS-6 is only available in the testing repo

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 4cedada14e12e677a180cfa1fce6442ecc763204)

install-deps.sh: use DTS on centos if GCC is too old

please note, run-make-check.sh sources install-deps.sh here to import
the $PATH and other environmental variables, which could be changed by
the the DTS "enable" script.

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 3f8647a7e80b20079bec97d5be12372909083bb4)

install-deps.sh: install centos-release-scl-rh on aarch64

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 84660c977cc7511290a3c5497468052b3eaccf43)

install-deps.sh: use gcc-7 on trusty

* always install gcc-7 on trusty
* point g++ to g++-7 if not yet

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 24d0f935dc661804a5b1fd619120026950f727d2)

install-deps.sh: always use yum-config-manager for consistency

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit eccc961c728153c928baa4478e9c8d5a1139a834)

install-deps.sh: install devtoolset-7 for centos/rhel

ready them for gcc7 and libstdc++-7 for better performance.

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit f9aa49cee15cd571a8dc2efcd46a54b0a1f68f89)

cmake: disable FAIL_ON_WARNINGS for rocksdb

otherwise -Werror=implicit-fallthrough will fail the build with GCC-7

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 6559a850512ddefef384d2733823ac2cb8027e3a)

qa: decrease the msg_inject_socket_failures from 1/500 to 1/1000

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

Merge PR #19462 into mimic-dev1

* refs/pull/19462/head:
memstore: write fsid to fsid not fs_fsid

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

memstore: write fsid to fsid not fs_fsid

Fixes: http://tracker.ceph.com/issues/20736
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>

qa/rgw: disable log trim in multisite suite

the multisite tests run manual trim operations with radosgw-admin, which
can race with internal log trimming to produce tests failures

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

qa/suites/rados: add missing openstack volumes

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

Merge pull request #19368 from dzafman/wip-22086

ceph-objectstore-tool: Add option "dump-import" to examine an export

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

test: ceph_objectstore_tool.py: Perform dump-import

Signed-off-by: David Zafman <dzafman@redhat.com>

Merge pull request #19356 from tchaikov/wip-18589-mimic-dev1

debian/control: adjust ceph-{osdomap,kvstore,monstore}-tool feature move

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

ceph-volume test logging ignored ceph.conf file

Signed-off-by: Alfredo Deza <adeza@redhat.com>

ceph-volume main warn on inability to load ceph.conf, don't raise

Signed-off-by: Alfredo Deza <adeza@redhat.com>

ceph-volume tests.api ensure that we can handle non-ceph tags in lvs

Signed-off-by: Alfredo Deza <adeza@redhat.com>

ceph-volume api.lvm only consider 'ceph.' tags in logical volumes

Signed-off-by: Alfredo Deza <adeza@redhat.com>

ceph-volume configuration allow inlined comments for # and ;

Signed-off-by: Alfredo Deza <adeza@redhat.com>

ceph-volume tests verify that INI comments can be inlined

Signed-off-by: Alfredo Deza <adeza@redhat.com>

ceph-volume lvm.create rollback osd creation when prepare or activate fails

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit 07be6fe0ab7981ebdc34779a8ccd6220d640a549)

ceph-volume lvm.create fallback to bluestore when objectstore is not specified

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit 6781d6498e01bfc89189c235540e5c2a2e6bc8ca)

ceph-volume lvm.prepare fallback to bluestore when objectstore is not specified

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit 9b17ad2f8fe617d219fdb2f46dd2675669f32f08)

ceph-volume lvm.prepare rollback osd when prepare fails and an osd id was generated

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit 579d12806b2ffc693a4e70ba3eaf663fa281d35e)

ceph-volume lvm.common create a rollback_osd utility to cleanup failed osd prepare/create calls

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit e533792e0dbafc160238c0f5783f4430e2705571)

Merge pull request #19363 from ceph/wip-rm22282

ceph-volume: removed the explicit use of sudo

Reviewed-by: Alfredo Deza <adeza@redhat.com>

ceph-objectstore-tool: Add option "dump-import" to examine an export

Fixes: http://tracker.ceph.com/issues/22086
Signed-off-by: David Zafman <dzafman@redhat.com>

ceph-volume: removed the explicit use of sudo

This will allow users to run ceph-volume on systems that do
not have sudo installed.

Fixes: http://tracker.ceph.com/issues/22282
Signed-off-by: Andrew Schoen <aschoen@redhat.com>

debian/control: adjust ceph-{osdomap,kvstore,monstore}-tool feature move

this is a follow-up of #19328. we need to get this change into 12.2.3.
so better off do the switch somewhere after 12.2.2 which has been
tagged, and before 12.2.3, which is not tagged yet.

please note, this is not targetting master, because i want to make
sure the change number (the <num> in << 12.2.2-<num>) is correct. it
does not hurt if it's not, as long as it is ">> 12.2.2", so the replace
machinery in 12.2.3 works, and it covers the releases where the
ceph-{osdomap,kvstore,monstore}-tool are not move yet. but why don't
make it more right?

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

ceph-objectstore-tool: Remove unused map section from log dump

Caused by: 44cb6d30640954c66fc03d4ce58b583ffd614951

Signed-off-by: David Zafman <dzafman@redhat.com>

ceph-objectstore-tool: Fix output of section type number

Signed-off-by: David Zafman <dzafman@redhat.com>

ceph-objectstore-tool: Improve ceph-objectstore-tool usage output

Remove unused argument test-align

Caused by: 1c8731c31eb53e17d8f363906438963ab5688fe0

Positional arguments are described by usage() because
the parsing code creates descriptions like "--object" for the
object positional argument.

Signed-off-by: David Zafman <dzafman@redhat.com>

qa/suites/rados/upgrade: whitelist MON_DOWN, MGR_DOWN

They get restarted.

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

Merge pull request #19328 from liewegas/wip-fix-tools-deb

debian/control: adjust ceph-{osdomap,kvstore,monstore}-tool feature move

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

debian/control: adjust ceph-{osdomap,kvstore,monstore}-tool feature move

The backport didn't make 12.2.2, but it will be in 12.2.3.

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

qa/suites/rados/singleton/all/threash-eio: whitelist OBJECT_*

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

PendingReleaseNotes: dummy commit

Just need a new to trigger a build on this branch.

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

Merge pull request #19196 from shun-s/wip-cephdisk-fix-major-error

ceph-disk: fix signed integer is greater than maximum when call major

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

Merge pull request #19296 from shinobu-x/strange_double_space

osd: Remove double space

osd: Remove double space

Should not break anything but just strange...

Signed-off-by: Shinobu Kinjo <shinobu@redhat.com>

Merge pull request #19161 from xiexingguo/wip-pg-log

osd/PGLog: get rid of ineffective container operations

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

osd/PGLog: get rid of ineffective container operations

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

Merge pull request #19242 from liewegas/wip-21147

qa/suites/rados/thrash: extend mgr beacon grace when many msgr failures injected

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

Merge pull request #19185 from liewegas/wip-trim-mgrmap

mon/MgrMonitor: limit mgrmap history

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

Merge pull request #19285 from ceph/wip-rm22299

ceph-volume Format correctly when vg/lv cannot be used

Reviewed-by: Andrew Schoen <aschoen@redhat.com>

Merge pull request #19259 from ceph/wip-rm22280

ceph-volume: handle leading whitespace/tabs in ceph.conf

Reviewed-by: Andrew Schoen <aschoen@redhat.com>

ceph-volume tests verify proper formatting of RuntimeError on vg/lv error

Signed-off-by: Alfredo Deza <adeza@redhat.com>

ceph-volume lvm.prepare correctly format argument for vg/lv error

Signed-off-by: Alfredo Deza <adeza@redhat.com>

Merge pull request #19264 from theanalyst/doc/releases/12.2.2

doc: add 12.2.2 release notes

Reviewed-By: Sage Weil <sage@redhat.com>
Reviewed-By: Nathan Cutler <ncutler@suse.com>

Merge pull request #19284 from theanalyst/changelog/12.2.2

doc: add changelog for v12.2.2

doc: add changelog for v12.2.2

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

Merge pull request #19278 from badone/wip-librgw_file_marker-unused-function-warnings

rgw_file: Silence unused-function warnings

Merge pull request #19281 from qrGitHub/wip-rgw-typo-anynoymous

rgw: fix typo anynoymous to anonymous

Reviewed-by: Jos Collin <jcollin@redhat.com>

doc: add 12.2.2 release notes

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

rgw: correct typo anynoymous to anonymous

Signed-off-by: Bingyin Zhang <zhangbingyin@cloudin.cn>

rgw_file: Silence unused-function warnings

Comment out unused insertion operators.

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

Merge pull request #19233 from tchaikov/wip-no-mon-health-to-clog-when-upgrading

qa: disable mon-health-to-clog in upgrade test

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

Merge pull request #19225 from tchaikov/wip-more-whitelist

qa/suites/rados/singleton: more whitelist

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

Merge pull request #19202 from tchaikov/wip-check-pthread-ext

cmake,common/RWLock: check for libpthread extensions

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

Merge pull request #19160 from shinobu-x/bluestore_tool_remove_redundant_code

os/bluestore/bluestore_tool: Move redundant code into one method

Reviewed-by: Igor Fedotov <ifedotov@mirantis.com>

Merge pull request #19100 from tchaikov/wip-log-reuse-streambuf

common/log: Speed improvement for log

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

Merge pull request #18124 from amitkumar50/cleanup-Min-Max

cleanup: Replacing MIN,MAX with std::min,std::max

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

Merge pull request #18991 from dmick/wip-ceph-disk-fsid

ceph_disk: allow "no fsid" on activate

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

Merge pull request #19262 from ceph/wip-fix-distro-master

tests - Replaced requests for "centos 7.3" to centos_latest

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

Merge pull request #19164 from hrchu/adminopsBindings

doc: rgw adminops binding libraries

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

doc: add 12.2.2 to releases table

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

doc: cleanup PendingReleaseNotes

drop sections already in previous releases, keeping only Mimic sections
and a new section header for items going post 12.2.2

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

qa: disable mon-health-to-clog in upgrade test

otherwise the cluster will complain that the quorum size is smaller than
that of monmap.

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

tests - Replaced requests for "centos 7.3" to centos_latest

Signed-off-by: Yuri Weinstein <yweinste@redhat.com>

Merge pull request #19247 from shinobu-x/rados_op_crush-map-edits_straw2

doc/rados: Add explanation of straw2

ceph-volume test leading whitespace is handled in configurations

Signed-off-by: Alfredo Deza <adeza@redhat.com>

ceph-volume trim tabbed/whitespaced configuration files when loading them

Signed-off-by: Alfredo Deza <adeza@redhat.com>

Merge pull request #19254 from tchaikov/wip-ceph-disk-mock-get-fsid

ceph-disk: mock get fsid

Reviewed-by: Alfredo Deza <adeza@redhat.com>

ceph-disk: silence deprecate warnings while testing

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

ceph-disk/tests: mock get_fsid

should offer a valid fsid for the ceph-disk under testing.

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

Merge PR #18995 into master

* refs/pull/18995/head:
client: emplace Cap in Inode caps map

Reviewed-by: Zheng Yan <zyan@redhat.com>

Merge PR #19009 into master

* refs/pull/19009/head:
client: Switch to new style config options and some cleanup

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>

Merge PR #19069 into master

* refs/pull/19069/head:
qa/tasks/ceph_fuse: fix ceph-fuse mount failed

Reviewed-by: Yunfei Guan <yunfei.guan@xtaotech.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Amit Kumar <amitkuma@redhat.com>

githubmap: update contributors

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>

Merge PR #19078 into master

* refs/pull/19078/head:
pybind: return error message when ceph_mds_command() returns error
mds: Fix error message when mds not active

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Zheng Yan <zyan@redhat.com>

Merge PR #19095 into master

* refs/pull/19095/head:
test: pass correct buffer length to ceph_getdents

Reviewed-by: Zheng Yan <zyan@redhat.com>

Merge PR #19181 into master

* refs/pull/19181/head:
client: give full error message on failed remount
client: use PATH_MAX for mount path size

Reviewed-by: Zheng Yan <zyan@redhat.com>

Merge PR #19207 into master

* refs/pull/19207/head:
mds: handle client reconnect gather race

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>

ceph-disk: fix signed integer is greater than maximum when call major
  fix signed integer is greater than maximum when call os.major
  using python 2.7.5 in Centos 7

Signed-off-by: Song Shun <song.shun3@zte.com.cn>

doc/rados: Add explanation of straw2

Signed-off-by: Shinobu Kinjo <shinobu@redhat.com>

Merge pull request #15482 from myoungwon/wip-chunked-manifest

osd,librados: add manifest, operations for chunked object

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

ceph_disk: allow "no fsid" on activate

The intent was to allow "no fsid" configurations when only one
conf file named 'ceph.conf' was present, but the code has a bug
in that ceph-osd --show-config-value will return a default all-0
uuid.  Treat 'all-0' as we were treating 'None'.

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

Merge pull request #18974 from liewegas/wip-22145

osd/PG: restart recovery if NotRecovering and unfound found

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>