Commit Graph

105689 Commits

Author SHA1 Message Date
Zac Dover
fb4f4acf02 doc: update list of formats for --format flag for "ceph pg dump"
This commit simply adds "json-pretty", "xml", and "xml-pretty" to
the list of formats available to the --format flag in the command
"ceph pg dump".

Signed-off-by: Zac Dover <zac.dover@gmail.com>
2019-12-20 22:32:33 +10:00
Sebastian Wagner
e4be7eedf1
Merge pull request #32353 from mgfritch/wip-cephadm-rename-tox
cephadm: Rename tox tests ceph-daemon -> cephadm

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
2019-12-20 10:13:37 +01:00
Kefu Chai
2fe7893c64
Merge pull request #32173 from rosinL/wip-fix-coremask
msg/async/dpdk: Fix the overflow while parsing dpdk coremask

Reviewed-by: Kefu Chai <kchai@redhat.com>
2019-12-20 16:37:20 +08:00
Sage Weil
cfef72ede7 Merge PR #32359 into master
* refs/pull/32359/head:
	qa/workunits: python -> python3 throughout
	qa/workunits/fs/misc/direct_io.py: fix for py3
	qa/tasks/cephfs: os.write takes bytes, not str

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2019-12-19 16:21:44 -06:00
Sage Weil
ad1a21712a Merge PR #32355 into master
* refs/pull/32355/head:
	qa/suites/rados/perf: run on ubuntu

Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2019-12-19 16:20:45 -06:00
Sage Weil
8099272b78 Merge PR #32356 into master
* refs/pull/32356/head:
	qa/suites/rados/thrash-old-clients: centos -> ubuntu

Reviewed-by: Neha Ojha <nojha@redhat.com>
2019-12-19 16:17:19 -06:00
Sage Weil
f9bd3d7673 Merge PR #32357 into master
* refs/pull/32357/head:
	qa/tasks/swift: remove swift tests

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2019-12-19 16:17:06 -06:00
Patrick Donnelly
1949ddf0e2
Merge PR #32117 into master
* refs/pull/32117/head:
	doc: add config help/get/set section for runtime client configuration

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2019-12-19 11:59:24 -08:00
Patrick Donnelly
49a093d79a
Merge PR #32168 into master
* refs/pull/32168/head:
	test_cephfs_shell: fix test_du_works_for_hardlinks

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2019-12-19 11:54:36 -08:00
Sage Weil
253a557f10 qa/workunits: python -> python3 throughout
Signed-off-by: Sage Weil <sage@redhat.com>
2019-12-19 12:38:47 -06:00
Sage Weil
d9756f0a08 qa/workunits/fs/misc/direct_io.py: fix for py3
os.write takes bytes, os.read returns bytes

Signed-off-by: Sage Weil <sage@redhat.com>
2019-12-19 12:35:13 -06:00
Sage Weil
aa9272d872 qa/tasks/swift: remove swift tests
- This is an ancient swift version
- The tempest tests are newer and show provide similar coverage
- It somehow broke with the py3 transition

Signed-off-by: Sage Weil <sage@redhat.com>
2019-12-19 12:21:21 -06:00
Sage Weil
922ba8bb4e qa/suites/rados/thrash-old-clients: centos -> ubuntu
We can't upgrade packages from el7 to el8, so do this on ubuntu 18.04.

Signed-off-by: Sage Weil <sage@redhat.com>
2019-12-19 12:16:00 -06:00
Sage Weil
4dcb7dcc6a qa/suites/rados/perf: run on ubuntu
pdsh and collectl packages don't seem to exist on el8.

Signed-off-by: Sage Weil <sage@redhat.com>
2019-12-19 12:03:10 -06:00
Sage Weil
05eb2f647d qa/tasks/cephfs: os.write takes bytes, not str
Signed-off-by: Sage Weil <sage@redhat.com>
2019-12-19 11:12:04 -06:00
Casey Bodley
757a605511
Merge pull request #31142 from zhangsw/fix-rgw-reshard-list-error
rgw: don't print error log when list reshard result is not truncated.

Reviewed-by: Daniel Gryniewicz <dang@redhat.com>
Reviewed-by: Casey Bodley <cbodley@redhat.com>
2019-12-19 11:19:14 -05:00
Sage Weil
1a624493c7 Merge PR #32335 into master
* refs/pull/32335/head:
	qa/tasks/s3tests_java: move to gradle 6.0.1

Reviewed-by: Ali Maredia <amaredia@redhat.com>
2019-12-19 10:16:10 -06:00
Sage Weil
755878e98e Merge PR #32343 into master
* refs/pull/32343/head:
	doc: update '--force' flag to be precise

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2019-12-19 09:27:36 -06:00
Casey Bodley
daeafeff1f
Merge pull request #31186 from zhangsw/clean-rgw-check-buckets-shard
rgw: remove unused bucket parameter in check_bucket_shards

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2019-12-19 10:24:10 -05:00
Michael Fritch
dcf8d6173f
cephadm: Rename tox tests ceph-daemon -> cephadm
Signed-off-by: Michael Fritch <mfritch@suse.com>
2019-12-19 08:16:38 -07:00
Casey Bodley
17d1d4e61f
Merge pull request #31150 from zhangsw/cleanup-rgw-reshard-last_run
rgw: remove unused 'last_run' in reshard thread entry
2019-12-19 10:14:16 -05:00
Sage Weil
3fb581c86f Merge PR #32339 into master
* refs/pull/32339/head:
	qa/tasks/cephfs: python3
	qa/workunits/fs: python3
	qa/tasks/cephfs/fuse_mount: use python3

Reviewed-by: Kefu Chai <kchai@redhat.com>
2019-12-19 08:13:27 -06:00
Kefu Chai
3e1e6a6694
Merge pull request #32344 from kotreshhr/boost_cmake_py3_fix
cmake/Boost: Fix python3 version

Reviewed-by: Kefu Chai <kchai@redhat.com>
2019-12-19 17:57:06 +08:00
Kotresh HR
886b18a9a2 cmake/Boost: Fix python3 version
Signed-off-by: Kotresh HR <khiremat@redhat.com>
2019-12-19 14:40:11 +05:30
Jos Collin
f35d03a037
doc: update '--force' flag to be precise
Signed-off-by: Jos Collin <jcollin@redhat.com>
2019-12-19 12:09:34 +05:30
Kefu Chai
dd84d07a01
Merge pull request #31525 from tchaikov/wip-no-py2-in-make-check
install-deps.sh,src: drop python2 support

Reviewed-by: Jan Fajerski <jfajerski@suse.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>
Reviewed-by: Sage Weil <sage@redhat.com>
2019-12-19 13:31:29 +08:00
Kefu Chai
6841b1356e test/run-rbd-tests: s/nosetests/python3 -m nose/
different distro use different names for nosetests3, so let's just go
with `python3 -m nose`

Signed-off-by: Kefu Chai <kchai@redhat.com>
2019-12-19 12:06:00 +08:00
Kefu Chai
717aaad9ed test/pybind: s/nosetests/python3/
different distros package python3-nose in different ways by adding
different postfix to "/usr/bin/nosetests" to differentiate it from
its python2 counterpart.

* on bionic, python3-nose offers "nosetests3"
* on el8, python3-nose offers "nosetests-3" and "nosetests-3.6"

Signed-off-by: Kefu Chai <kchai@redhat.com>
2019-12-19 11:52:56 +08:00
Kefu Chai
46358e04d2 cmake: drop Find{Python,Python2}.cmake
since we are python3 only, there is no need to check Python2 anymore.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2019-12-19 11:52:56 +08:00
Kefu Chai
5c990ddd8e install-deps.sh: do not echo version of git
Signed-off-by: Kefu Chai <kchai@redhat.com>
2019-12-19 11:52:56 +08:00
Kefu Chai
e06b7bdd4f install-deps.sh: silence popd and pushd
otherwise they will echo the pushed/popped directory

Signed-off-by: Kefu Chai <kchai@redhat.com>
2019-12-19 11:52:56 +08:00
Kefu Chai
48c4bc445f mgr: drop the compatibility with python2
Signed-off-by: Kefu Chai <kchai@redhat.com>
2019-12-19 11:52:56 +08:00
Kefu Chai
5d4c2c71bd install-deps.sh: revert a5a44cf4
we don't prepare wheels for python2 anymore, and we don't test for
python2. so no need to test for python2

Signed-off-by: Kefu Chai <kchai@redhat.com>
2019-12-19 11:52:56 +08:00
Kefu Chai
7fec5f7a67 install-deps.sh: stop preparing wheels for python2
Signed-off-by: Kefu Chai <kchai@redhat.com>
2019-12-19 11:52:56 +08:00
Kefu Chai
a04010522b pybind/mgr: remove py27 from envlist in tox.ini
Signed-off-by: Kefu Chai <kchai@redhat.com>
2019-12-19 11:52:55 +08:00
Kefu Chai
5e41205a71 python-common: remove py27 from envlist in tox.ini
Signed-off-by: Kefu Chai <kchai@redhat.com>
2019-12-19 11:52:55 +08:00
Kefu Chai
fd9461e33c ceph-volume/test: check using python3 instead of python
Signed-off-by: Kefu Chai <kchai@redhat.com>
2019-12-19 11:52:55 +08:00
Kefu Chai
79584862f6 src,qa: install python bindings into lib/cython_modules/lib.3
instead of checking for the WITH_PYTHON* options, just hardwire to lib.3

Signed-off-by: Kefu Chai <kchai@redhat.com>
2019-12-19 11:52:54 +08:00
Sage Weil
3c751fea7f qa/tasks/cephfs: python3
Signed-off-by: Sage Weil <sage@redhat.com>
2019-12-18 21:51:52 -06:00
Kefu Chai
5fc657b40d cmake: drop WITH_PYTHON2 option
* drop WITH_PYTHON2 option
* print warning message if WITH_PYTHON3 is disabled
* drop MGR_PYTHON_VERSION option, as we don't support use different
  python version for python binding and ceph-mgr embedded python
  interpreter anymore. as before switching to python3-only build,
  we can build python3 and python2 python bindings, and ceph-mgr
  can use either of them. but after switching to python3-only
  build, ceph-mgr has to use whatever python version used to
  build python binding.
* move WITH_PYTHON3 option to $top_srcdir/CMakeLists.txt, as ceph-mgr
  and python binding will share this option.
* hardware ${PYTHON_VERSION} to 3
* hardware ${Python${PYTHON_VERSION}_VERSION_MAJOR} to 3
* only build boost library with python3
* s/Python_EXECUTABLE/Python3_EXECUTABLE/
* update the build scripts and packagings accordingly
* rename all cython${PYTHON_VERSION}_* targets to cython_*
* update distutils_install_module() so it does not take python_version
  parameter anymore.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2019-12-19 10:58:58 +08:00
Kefu Chai
47d0e1e16d cmake: CMAKE_ROLE defaults to "PROJECT"
so we can use exported targets like "Python3::Python", which is defined
only if CMAKE_ROLE is "PROJECT". but this global property was introduced
by CMake 3.14, but the minimum required version of CMake is 3.10.2 in
Ceph project at this moment. let's set it if it's not defined.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2019-12-19 10:58:58 +08:00
Chunsong Feng
775244af0d msg/async/dpdk: Fix the overflow while parsing dpdk coremask
coremask supports up to 256 bits in DPDK19.05, using stoull in
dpdk::eal:init limits coremask up to 64 bits. Parse coremask by hex
character from low to high.

Fixes: https://tracker.ceph.com/issues/43044

Signed-off-by: Hu Ye <yehu5@huawei.com>
Signed-off-by: Chunsong Feng <fengchunsong@huawei.com>
Signed-off-by: luo rixin <luorixin@huawei.com>
2019-12-19 08:59:04 +08:00
Sage Weil
c3112510c1 qa/workunits/fs: python3
Signed-off-by: Sage Weil <sage@redhat.com>
2019-12-18 17:39:03 -06:00
Sage Weil
1de47907c3 qa/tasks/cephfs/fuse_mount: use python3
Signed-off-by: Sage Weil <sage@redhat.com>
2019-12-18 17:13:57 -06:00
Sage Weil
9fc9197db0 Merge PR #32323 into master
* refs/pull/32323/head:
	spec, debian: cephadm requires lvm2

Reviewed-by: Nathan Cutler <ncutler@suse.com>
Reviewed-by: Sage Weil <sage@redhat.com>
2019-12-18 17:10:09 -06:00
Sage Weil
f71bb6c731 qa/tasks/s3tests_java: move to gradle 6.0.1
Also switch to using a stable symlink so that the version is determined by the branch.

Signed-off-by: Sage Weil <sage@redhat.com>
2019-12-18 17:04:20 -06:00
Sage Weil
4155e609dd Merge PR #32191 into master
* refs/pull/32191/head:
	doc: clarify priority use

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2019-12-18 16:22:36 -06:00
Sage Weil
98f5ce79a6 Merge PR #32310 into master
* refs/pull/32310/head:
	Revert "qa/suites/rgw: ragweed on ubuntu"
	Revert "qa/suites/rgw: disable remaining ragweed test"

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2019-12-18 12:20:03 -06:00
Casey Bodley
17c65b0376
Merge pull request #32121 from yehudasa/wip-42869
rgw: bucket re-creation fixes

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2019-12-18 12:35:51 -05:00
Casey Bodley
dc9d0b9d43
Merge pull request #32309 from cbodley/wip-43359
rgw: data sync markers include timestamp from datalog entry

Reviewed-by: Shilpa Jagannath <smanjara@redhat.com>
2019-12-18 10:34:15 -05:00