Commit Graph

105651 Commits

Author SHA1 Message Date
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
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
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
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
Casey Bodley
7b975781ae
Merge pull request #32311 from cbodley/wip-43360
radosgw-admin: sync status displays id of shard furthest behind

Reviewed-by: Shilpa Jagannath <smanjara@redhat.com>
2019-12-18 10:34:02 -05:00
Kefu Chai
8f76706c72
Merge pull request #32324 from tchaikov/wip-copr-repo
install-deps.sh: add ken's copr repo for el8 build

Reviewed-by: Alfredo Deza <adeza@redhat.com>
2019-12-18 22:11:15 +08:00
Kefu Chai
a1550827f2
Merge pull request #32317 from tchaikov/wip-rpm-pyOpenSSL
ceph.spec.in: always depends on python3.6-pyOpenSSL

Reviewed-by: Alfredo Deza <adeza@redhat.com>
2019-12-18 22:10:39 +08:00
Kefu Chai
7f6e30d628 install-deps.sh: add ken's copr repo for el8 build
Signed-off-by: Kefu Chai <kchai@redhat.com>
2019-12-18 21:57:38 +08:00
Sebastian Wagner
b2cf2c7a8d spec, debian: cephadm requires lvm2
cephadm mounts `/run/lvm` into OSD containers, which only exists,
if `lvm2` is installed on the container host. Otherwise we cannot
start ceph-volume or osd containers.

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

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
2019-12-18 14:40:17 +01:00
Kefu Chai
904650262c ceph.spec.in: always depends on python3.6-pyOpenSSL
since we've moved to py3-only world, there is no need to depend on
pyOpenSSL anymore.

also, _python_buildid was removed in
3bf8b4d7d6 .

Signed-off-by: Kefu Chai <kchai@redhat.com>
2019-12-18 15:01:27 +08:00
Patrick Donnelly
f2f53eeaef
Merge PR #31527 into master
* refs/pull/31527/head:
	vstart: Add note for nfs-ganesha dev packages
	stop.sh: Add option to kill Ganesha daemons
	vstart: Add option to deploy ganesha daemons

Reviewed-by: Jeff Layton <jlayton@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Ramana Raja <rraja@redhat.com>
2019-12-17 16:56:15 -08:00
Kefu Chai
8a4458f54e
Merge pull request #32303 from tchaikov/wip-build-integration-branch
build-integration-branch: s/prefix/postfix/

Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
2019-12-18 08:37:58 +08:00
Patrick Donnelly
b561e57b80
Merge PR #32291 into master
* refs/pull/32291/head:
	doc: update 'adding an MDS'

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2019-12-17 16:23:17 -08:00
Sage Weil
3268ec7ac8 Merge PR #32252 into master
* refs/pull/32252/head:
	qa/cephfs/begin: libaio-devel on el8
	qa/tasks: nosetests -> python -m nose
	qa/tasks/rbd_fio: fio 2.21 -> 3.16
	src/test/cli-integration/rbd/snap-diff.t: python -> python
	qa/workunits: use nose 3
	qa/tasks/cbt: install python3 deps
	qa/tasks/ceph_manager.py: do not use python to write a file
	test/pybind/test_rados: execute takes a bytes (not str) payload
	qa/packages/packages: python[3]-ceph is no more
	qa: use python3 for venvs etc
	packaging: remove python3-ipaddres, as it is part of the stdlib in py3
	qa/packages: python-ceph -> python3-ceph
	qa/distros: centos7 -> centos8, rhel7 -> rhel8
	spec: remove _python_buildid in favor of python3_pkgversion macro
	spec: remove python2 packages and conditions
	debian: remove python >= 2.7 requirement
	debian: add mgr python versions
	debian: explicitly set PYTHON2=OFF to prevent picking up python2 interpreter
	debian: update control file to use python3 dependency names
	debian: remove all python2 overrides and declarations
	debian: remove all python2 install files

Reviewed-by: Alfredo Deza <adeza@redhat.com>
2019-12-17 15:23:27 -06:00
Casey Bodley
d61beb74f6 radosgw-admin: sync status displays id of shard furthest behind
'radosgw-admin sync status' gives you a timestamp for the "oldest
incremental change not applied", but doesn't tell you which shard that
came from. add [shard-id] to the output

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

Signed-off-by: Casey Bodley <cbodley@redhat.com>
2019-12-17 15:45:30 -05:00
Sage Weil
9dd7ed8860 Revert "qa/suites/rgw: ragweed on ubuntu"
This reverts commit 73c2779524.

Signed-off-by: Sage Weil <sage@redhat.com>
2019-12-17 14:40:34 -06:00
Sage Weil
ce308a8d0d Revert "qa/suites/rgw: disable remaining ragweed test"
This reverts commit 5a80fbe505.

Signed-off-by: Sage Weil <sage@redhat.com>
2019-12-17 14:40:21 -06:00
Sage Weil
2f45c3cc0e Merge PR #32146 into master
* refs/pull/32146/head:
	mgr/ssh: Fix remove_osds()

Reviewed-by: Sage Weil <sage@redhat.com>
2019-12-17 14:22:04 -06:00
Sage Weil
a60062a24f Merge PR #32149 into master
* refs/pull/32149/head:
	mgr/orchestrator: Rename PlacementSpec.nodes -> PlacementSpec.hosts
	mgr/ansible: Added missing type annotations
	mgr/orchestrator: Add __str__ to HostSpec
	mgr/ansible: Integrate mgr/ansible/tox into mgr/tox

Reviewed-by: Kefu Chai <kchai@redhat.com>
2019-12-17 14:21:48 -06:00
Sage Weil
c8478cf24f Merge PR #32278 into master
* refs/pull/32278/head:
	qa/suites/rgw: disable valgrind for tests that require py2/ubuntu
	qa/suites/rgw: disable remaining ragweed test
	qa/suites/rgw: pin swift tests to py2/ubuntu
	qa/suites/rgw: ragweed on ubuntu
	qa/suites: run s3tests on ubuntu

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2019-12-17 13:57:12 -06:00
Sage Weil
667d70b6fc qa/cephfs/begin: libaio-devel on el8
Signed-off-by: Sage Weil <sage@redhat.com>
2019-12-17 13:39:08 -06:00
Casey Bodley
b403e01118 rgw: data sync markers include timestamp from datalog entry
this corrects the output of 'radosgw-admin data sync status' to show the
timestamp of the last datalog entry applied

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

Signed-off-by: Casey Bodley <cbodley@redhat.com>
2019-12-17 14:38:41 -05:00
Sage Weil
5602f3a446 Merge PR #32300 into master
* refs/pull/32300/head:
	cephadm: drop 'sha256:' prefix on container id

Reviewed-by: Michael Fritch <mfritch@suse.com>
Reviewed-by: Sebastian Wagner <swagner@suse.com>
2019-12-17 13:32:38 -06:00
Sage Weil
29b155de16 Merge PR #32302 into master
* refs/pull/32302/head:
	cephadm: check for both ntp.service and ntpd.service

Reviewed-by: Michael Fritch <mfritch@suse.com>
2019-12-17 13:32:24 -06:00
Sage Weil
6476517def qa/tasks: nosetests -> python -m nose
Signed-off-by: Sage Weil <sage@redhat.com>
2019-12-17 12:57:57 -06:00
Sage Weil
ea21829ae7 qa/suites/rgw: disable valgrind for tests that require py2/ubuntu
Signed-off-by: Sage Weil <sage@redhat.com>
2019-12-17 12:26:15 -06:00
Jason Dillaman
6787219e71
Merge pull request #32280 from dillaman/wip-librbd-qos-test
qa/workunit/rbd: fixed QoS throughput unit parsing

Reviewed-by: Mykola Golub <mgolub@suse.com>
2019-12-17 12:30:52 -05:00
Sage Weil
92b0638efd Merge PR #32279 into master
* refs/pull/32279/head:
	mgr/orchestrator_cli: combine all host into one 'device ls' table
	python-common: 'ssd/nvme' -> 'ssd'
	mgr/orchestrator_cli: make 'device ls' table formatting consistent

Reviewed-by: Sebastian Wagner <swagner@suse.com>
2019-12-17 10:59:26 -06:00
Sage Weil
0e738af729 Merge PR #32282 into master
* refs/pull/32282/head:
	cephadm: clean up shell containers on exit
	cephadm: do not force container removal on unit stop

Reviewed-by: Sebastian Wagner <swagner@suse.com>
Reviewed-by: Michael Fritch <mfritch@suse.com>
2019-12-17 10:59:11 -06:00
Sage Weil
5a80fbe505 qa/suites/rgw: disable remaining ragweed test
Needs to be py3 since it relies on the python bindings.

Signed-off-by: Sage Weil <sage@redhat.com>
2019-12-17 10:47:49 -06:00
Sage Weil
91da2fe0d2 Merge PR #32284 into master
* refs/pull/32284/head:
	qa/suites/rbd/openstack: use 18.04, not 16.04

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2019-12-17 10:32:52 -06:00
Sage Weil
1e0c2e2061 cephadm: drop 'sha256:' prefix on container id
Podman doesn't include the prefix--only the (bionic) docker as far as I
can tell.

Signed-off-by: Sage Weil <sage@redhat.com>
2019-12-17 09:59:46 -06:00
Jason Dillaman
72ff60db4b
Merge pull request #32273 from changchengx/doc_libvirt
doc/rbd: refine rbd/libvirt usage

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2019-12-17 10:57:06 -05:00
Kefu Chai
67cf46df18 build-integration-branch: s/prefix/postfix/
prefix is not defined.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2019-12-17 23:48:02 +08:00
Kefu Chai
068aafb2ea
Merge pull request #32296 from rzarzynski/wip-seastar-pickup-futureopt
seastar: pickup the recent future optimizations.

Reviewed-by: Kefu Chai <kchai@redhat.com>
2019-12-17 23:30:28 +08:00
Sebastian Wagner
70bae966aa mgr/orchestrator: Rename PlacementSpec.nodes -> PlacementSpec.hosts
By definition in the orchestrator's docs, we're using `host` insted of `node`

Fixes wrong usage of PlacementSpec in mgr/ansible

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
2019-12-17 16:27:57 +01:00
Kefu Chai
35909b8dff
Merge pull request #32301 from tchaikov/wip-build-doc
admin/doc-requirements.txt: bump up Sphinx and breathe

Reviewed-by: Sage Weil <sage@redhat.com>
2019-12-17 23:27:21 +08:00