Commit Graph

105366 Commits

Author SHA1 Message Date
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
fc6840933b qa/tasks/rbd_fio: fio 2.21 -> 3.16
2.21 doesn't build on el8; 3.16 does.

Signed-off-by: Sage Weil <sage@redhat.com>
2019-12-16 17:03:06 -06:00
Sage Weil
2c655f2555 src/test/cli-integration/rbd/snap-diff.t: python -> python
Signed-off-by: Sage Weil <sage@redhat.com>
2019-12-16 17:03:06 -06:00
Sage Weil
889446a515 qa/workunits: use nose 3
Ubuntu is /usr/bin/nosetests3, el is /usr/bin/nosetests-3, so do neither.

Signed-off-by: Sage Weil <sage@redhat.com>
2019-12-16 17:02:45 -06:00
Sage Weil
299375852a qa/tasks/cbt: install python3 deps
Signed-off-by: Sage Weil <sage@redhat.com>
2019-12-16 10:46:13 -06:00
Sage Weil
d4f4a2cbd8 qa/tasks/ceph_manager.py: do not use python to write a file
/usr/bin/python dne on el8, /usr/bin/python3 dne on el7.  But
all we need to do is write a file--we can do that with tee.

Signed-off-by: Sage Weil <sage@redhat.com>
2019-12-13 12:44:42 -06:00
Sage Weil
aaeabf97b1 test/pybind/test_rados: execute takes a bytes (not str) payload
Signed-off-by: Sage Weil <sage@redhat.com>
2019-12-13 11:14:30 -06:00
Sage Weil
056383ea02 qa/packages/packages: python[3]-ceph is no more
Signed-off-by: Sage Weil <sage@redhat.com>
2019-12-13 11:03:11 -06:00
Sage Weil
240154f114 qa: use python3 for venvs etc
Signed-off-by: Sage Weil <sage@redhat.com>
2019-12-13 08:47:28 -06:00
Alfredo Deza
7382221989 packaging: remove python3-ipaddres, as it is part of the stdlib in py3
Signed-off-by: Alfredo Deza <adeza@redhat.com>
2019-12-12 19:16:33 -05:00
Sage Weil
4b96369bbe qa/packages: python-ceph -> python3-ceph
Signed-off-by: Sage Weil <sage@redhat.com>
2019-12-12 13:10:07 -06:00
Sage Weil
1eb8198d0b qa/distros: centos7 -> centos8, rhel7 -> rhel8
Signed-off-by: Sage Weil <sage@redhat.com>
2019-12-12 13:10:07 -06:00
Alfredo Deza
3bf8b4d7d6 spec: remove _python_buildid in favor of python3_pkgversion macro
Signed-off-by: Alfredo Deza <adeza@redhat.com>
2019-12-12 13:10:07 -06:00
Alfredo Deza
29d1c34424 spec: remove python2 packages and conditions
Signed-off-by: Alfredo Deza <adeza@redhat.com>
2019-12-12 13:07:12 -06:00
Alfredo Deza
68025b6335 debian: remove python >= 2.7 requirement
Signed-off-by: Alfredo Deza <adeza@redhat.com>
2019-12-12 13:06:54 -06:00
Alfredo Deza
4b2b066217 debian: add mgr python versions
Signed-off-by: Alfredo Deza <adeza@redhat.com>
2019-12-12 13:06:54 -06:00
Alfredo Deza
f317453c02 debian: explicitly set PYTHON2=OFF to prevent picking up python2 interpreter
Signed-off-by: Alfredo Deza <adeza@redhat.com>
2019-12-12 13:06:54 -06:00
Alfredo Deza
5016209146 debian: update control file to use python3 dependency names
Signed-off-by: Alfredo Deza <adeza@redhat.com>
2019-12-12 13:06:54 -06:00
Alfredo Deza
adae1ac89a debian: remove all python2 overrides and declarations
Signed-off-by: Alfredo Deza <adeza@redhat.com>
2019-12-12 13:04:57 -06:00
Alfredo Deza
1f3eac2721 debian: remove all python2 install files
Signed-off-by: Alfredo Deza <adeza@redhat.com>
2019-12-12 13:04:33 -06:00
Kefu Chai
729401fa51
Merge pull request #32151 from liewegas/fix-scipy
install-deps.sh: preload wheel for all mgr requirements.txt files

Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2019-12-12 22:06:20 +08:00
Mykola Golub
9adbe9367d
Merge pull request #32172 from wjwithagen/wjw-fix-test_cls_rbd-compat
test/cls_rbd: include compat.h for ERESTART

Reviewed-by: Mykola Golub <mgolub@suse.com>
2019-12-12 14:00:43 +02:00
Sebastian Wagner
9242d53970
Merge pull request #32182 from sebastian-philipp/upstream-pull-31757
mgr/test_orchestrator: Add dummy data

Reviewed-by: Volker Theile <vtheile@suse.com>
2019-12-12 12:27:46 +01:00
Lenz Grimmer
6bab7c8002
Merge pull request #31920 from ricardoasmarques/fix-sso-certs
mgr/dashboard: Invalid SSO configuration when certificate path does not exist

Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
2019-12-12 09:47:12 +00:00
Lenz Grimmer
63c6c230aa
mgr/dashboard: Use badges for counters in tabs (#31938)
mgr/dashboard: Use badges for counters in tabs

Reviewed-by: Stephan Müller <smueller@suse.com>
Reviewed-by: Tiago Melo <tmelo@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
2019-12-12 09:44:18 +00:00
Jan Fajerski
c2ebd382a2
Merge pull request #31787 from shyukri/wip-36728-c_v-util-which-path
ceph-volume: util: look for executable in $PATH
2019-12-12 10:26:39 +01:00
Nathan Cutler
be25c6ed0c
Merge pull request #32080 from smithfarm/wip-43171
ceph.spec.in: move distro-conditional deps to dedicated section

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
2019-12-12 10:18:13 +01:00
Kefu Chai
40e755c36f
Merge pull request #32175 from rzarzynski/wip-crimson-errorator-do_with-friendship
crimson: make seastar::do_with() a friend of errorated futures.

Reviewed-by: Liu-Chunmei <chunmei.liu@intel.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2019-12-12 17:00:47 +08:00
Sage Weil
b733e78f46 debian/control: install scipy for build too
Needed for make check

Signed-off-by: Sage Weil <sage@redhat.com>
2019-12-12 16:53:33 +08:00
Kefu Chai
cb399a9b39
Merge pull request #32143 from tchaikov/wip-qa-rocksdb-test
qa/workunits/rados/test_envlibrados_for_rocksdb: accomodate rocksdb c…

Reviewed-by: Neha Ojha <nojha@redhat.com>
2019-12-12 13:51:03 +08:00
Xie Xingguo
c4d12bfef8
Merge pull request #32099 from hjwsm1989/wip-cancel-invalid-upmap-2
crush: remove invalid upmap items

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Reviewed-by: David Zafman <dzafman@redhat.com>
2019-12-12 11:11:34 +08:00
Sage Weil
cdad3d2001 Merge PR #32193 into master
* refs/pull/32193/head:
	qa/tasks/ceph2 -> cephadm
	mgr/ssh -> mgr/cephadm
	mgr/ssh,cephadm: ceph-daemon -> cephadm
	doc/bootstrap: ceph-daemon -> cephadm
	ceph-daemon-adoption-corpus -> cephadm-adoption-corpus
	qa: rename ceph-daemon tests -> cephadm
	qa/tasks: ceph-daemon -> cephadm throughput var names and comments
	mgr/ssh,qa/tasks/ceph2: fix mode to be cephadm-package (vs root)
	mgr/ssh: rename option ceph_daemon_path -> cephadm_path
	files,rpm,deb: rename ceph-daemon -> cephadm

Reviewed-by: Michael Fritch <mfritch@suse.com>
Reviewed-by: Sebastian Wagner <swagner@suse.com>
2019-12-11 20:30:53 -06:00
Sage Weil
6c4541bb28 qa/tasks/ceph2 -> cephadm
Signed-off-by: Sage Weil <sage@redhat.com>
2019-12-11 19:14:24 -06:00
Sage Weil
cd1c05acbb mgr/ssh -> mgr/cephadm
Signed-off-by: Sage Weil <sage@redhat.com>
2019-12-11 19:14:24 -06:00
Sage Weil
f466b3a149 mgr/ssh,cephadm: ceph-daemon -> cephadm
Signed-off-by: Sage Weil <sage@redhat.com>
2019-12-11 19:14:18 -06:00
Sage Weil
9fb2bfed0c doc/bootstrap: ceph-daemon -> cephadm
Signed-off-by: Sage Weil <sage@redhat.com>
2019-12-11 19:14:18 -06:00
Sage Weil
d120ffcdff ceph-daemon-adoption-corpus -> cephadm-adoption-corpus
Signed-off-by: Sage Weil <sage@redhat.com>
2019-12-11 19:14:17 -06:00
Sage Weil
137fa64e12 qa: rename ceph-daemon tests -> cephadm
Also move the workunit to a better location.

Signed-off-by: Sage Weil <sage@redhat.com>
2019-12-11 19:14:09 -06:00
Sage Weil
51ecc1b922 qa/tasks: ceph-daemon -> cephadm throughput var names and comments
Signed-off-by: Sage Weil <sage@redhat.com>
2019-12-11 19:14:09 -06:00
Sage Weil
7d63071d4e mgr/ssh,qa/tasks/ceph2: fix mode to be cephadm-package (vs root)
At the same time align the option names with ceph2.py, yay.

Signed-off-by: Sage Weil <sage@redhat.com>
2019-12-11 19:14:09 -06:00
Sage Weil
caf95211c0 mgr/ssh: rename option ceph_daemon_path -> cephadm_path
Signed-off-by: Sage Weil <sage@redhat.com>
2019-12-11 19:14:09 -06:00
Sage Weil
c8750b7066 files,rpm,deb: rename ceph-daemon -> cephadm
This is just renaming the files and adjusting the packages.  Lots of
cleanup to do still.

Signed-off-by: Sage Weil <sage@redhat.com>
2019-12-11 19:14:09 -06:00
Sage Weil
a5b3037050 Merge PR #32189 into master
* refs/pull/32189/head:
	mgr/orchestrator_cli: set type for 'orchestrator' option

Reviewed-by: Sebastian Wagner <swagner@suse.com>
2019-12-11 15:49:04 -06:00
Sage Weil
a2af551872 Merge PR #32157 into master
* refs/pull/32157/head:
	ceph-daemon: fix pod stop

Reviewed-by: Sebastian Wagner <swagner@suse.com>
Reviewed-by: Michael Fritch <mfritch@suse.com>
2019-12-11 15:48:47 -06:00
Sebastian Wagner
e8b40e607b python-common: Also test mgr/test_orchestrator/dummy_data.json
Make sure, `pybind/mgr/test_orchestrator/dummy_data.json` is not getting out of date.

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
2019-12-11 22:34:03 +01:00
Sage Weil
e6c5554759 mgr/orchestrator_cli: set type for 'orchestrator' option
If we don't specify the type, the mgr_module.py will str() the default
value, turning it into "None", breaking the self-test.

Signed-off-by: Sage Weil <sage@redhat.com>
2019-12-11 12:26:10 -06:00
Patrick Donnelly
2216c63ed5
Merge PR #31729 into master
* refs/pull/31729/head:
	qa: reduce cache size further
	mds: obsoleting 'mds_cache_size'

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2019-12-11 09:44:27 -08:00
Patrick Donnelly
70c6043fbc
Merge PR #31718 into master
* refs/pull/31718/head:
	mds: Reorganize class members in ScrubStack header

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2019-12-11 09:42:18 -08:00
Patrick Donnelly
390661b40e
Merge PR #31717 into master
* refs/pull/31717/head:
	mds: Reorganize class members in ScrubHeader header

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2019-12-11 09:41:27 -08:00
Patrick Donnelly
2399be4a70
Merge PR #31716 into master
* refs/pull/31716/head:
	mds: Reorganize class members in ScatterLock header

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2019-12-11 09:40:25 -08:00