]>
git.apps.os.sepia.ceph.com Git - ceph.git/log
Kefu Chai [Tue, 24 Mar 2020 10:15:58 +0000 (18:15 +0800)]
qa/tasks/cephfs: fix syntax error
it's a regression introduced by
9f6c764f10
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit
496d7e21325e8efa6bbac57a519db2f07d8d7ee5 )
Kefu Chai [Fri, 27 Mar 2020 05:33:05 +0000 (13:33 +0800)]
qa/tasks/mgr: fix imports for py3
Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
(cherry picked from commit
e7473b631d862110160c3ef95aa6edce11fe2092 )
Kyr Shatskyy [Mon, 16 Dec 2019 02:13:50 +0000 (03:13 +0100)]
qa/tasks/ceph_fuse: fix import for py3
Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
(cherry picked from commit
ac2fa95b21a3d4b3719af39c6416606111458cf8 )
Kyr Shatskyy [Fri, 21 Feb 2020 18:45:58 +0000 (19:45 +0100)]
qa/tasks/qemu: get rid of cStringIO for py3
Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
(cherry picked from commit
914c0816e639b16780cfb991f5a89ffbb496d001 )
Kyr Shatskyy [Sat, 15 Feb 2020 10:20:11 +0000 (11:20 +0100)]
qa/tasks/ragweed: get rid of cString for py3
Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
(cherry picked from commit
f0c5f56ef8ba869ccacf799a9ed6df9dedf0caaa )
Kyr Shatskyy [Sat, 15 Feb 2020 10:12:40 +0000 (11:12 +0100)]
qa/tasks/s3tests: py3 compat
- use string.ascii_uppercase instead string.uppercase
- use six.ensure_str for bytes when required
- use six.ensure_binary if needed
- get rid of dict.itervalues in favor of dict.values
- get rid of cStringIO.StringIO in favor io.BytesIO
Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
(cherry picked from commit
478083e7319b0fc0eba5fc4f7fa9193ece784b15 )
Kyr Shatskyy [Sat, 15 Feb 2020 11:08:52 +0000 (12:08 +0100)]
qa/tasks/rgw_logsocket: get rid of cStringIO for py3
Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
(cherry picked from commit
4cf205f2856b66140f798484bff4951c95ad01a1 )
Kyr Shatskyy [Mon, 16 Dec 2019 10:35:08 +0000 (11:35 +0100)]
qa/tasks: fix import module path for py3 compat
Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
(cherry picked from commit
1c81d3873d904e42f7a534db0e419c23e5220aed )
Kyr Shatskyy [Mon, 16 Dec 2019 01:46:13 +0000 (02:46 +0100)]
qa/tasks/cephfs/kernel_mount: get rid of StringIO.StringIO for py3
Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
(cherry picked from commit
875b45f3c903781ba99dbd2fcf4d2fc89001c25b )
Conflicts:
qa/tasks/cephfs/kernel_mount.py: trivial resolution
Kyr Shatskyy [Mon, 16 Dec 2019 01:50:09 +0000 (02:50 +0100)]
qa/tasks/kclient: fix import for py3
Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
(cherry picked from commit
06f22a3097c66a3f04e2b00a388aa468fa5dbd30 )
Kyr Shatskyy [Thu, 5 Mar 2020 22:40:47 +0000 (23:40 +0100)]
qa/tasks/rbd_fio: get rid of StringIO for py3
Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
(cherry picked from commit
db7ae8eff60a9e3cb26e4e5c736a9691cd3224e3 )
Kefu Chai [Fri, 27 Mar 2020 04:58:16 +0000 (12:58 +0800)]
qa/tasks/s3readwrite: avoid using cStringIO
cStringIO is not offered by python3, so avoid using using this module.
this file does not exist in master anymore, so this change is not
cherry-picked from master.
Signed-off-by: Kefu Chai <kchai@redhat.com>
Kyr Shatskyy [Sat, 15 Feb 2020 02:51:46 +0000 (03:51 +0100)]
qa/tasks/rbd: get rid of cStringIO for py3
Use io.BytesIO and six.ensure_str for py3 compatibility
instead of cStringIO.StringIO
Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
(cherry picked from commit
7b72097cd1cf93f5445483802344327f1e3da0bc )
Thomas Bechtold [Mon, 9 Dec 2019 16:27:46 +0000 (17:27 +0100)]
qa: Run flake8 on python2 and python3
To be able to catch problems with python2 *and* python3, run flake8
with both versions. From the flake8 homepage:
It is very important to install Flake8 on the correct version of
Python for your needs. If you want Flake8 to properly parse new
language features in Python 3.5 (for example), you need it to be
installed on 3.5 for Flake8 to understand those features. In many
ways, Flake8 is tied to the version of Python on which it runs.
Also fix the problems with python3 on the way.
Note: This requires now the six module for teuthology. But this is
already an install_require in teuthology itself.
Signed-off-by: Thomas Bechtold <tbechtold@suse.com>
(cherry picked from commit
bdcc94a1d1f659b1524fdc6bb8bd1da6d38a30d2 )
Conflicts:
qa/CMakeLists.txt
qa/tasks/ceph_manager.py
qa/tasks/cephfs/xfstests_dev.py
qa/tasks/cram.py
qa/tasks/manypools.py
qa/tasks/ragweed.py
qa/tasks/s3tests.py
qa/tasks/vstart_runner.py
qa/tasks/workunit.py
qa/tox.ini: trivial resolutions
Kyr Shatskyy [Thu, 5 Mar 2020 23:27:59 +0000 (00:27 +0100)]
qa/tasks/devstack: use six.StringIO for py3 compat
Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
(cherry picked from commit
09ae86aa9ecc276d75a14395aaabc12de1115c04 )
Kefu Chai [Fri, 27 Mar 2020 04:33:01 +0000 (12:33 +0800)]
qa/tasks/swift.py: s/StringIO/BytesIO/
cStringIO is not offered by python3, so avoid using using this module.
this file does not exist in master anymore, so this change is not
cherry-picked from master.
Signed-off-by: Kefu Chai <kchai@redhat.com>
Kyr Shatskyy [Fri, 21 Feb 2020 18:13:16 +0000 (19:13 +0100)]
qa/tasks/radosgw_admin: get rid of cStringIO for py3
Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
(cherry picked from commit
0a224991cfb4cb9683e27c9afe6b922415a6f8ed )
Kefu Chai [Fri, 27 Mar 2020 04:06:51 +0000 (12:06 +0800)]
tasks/s3roundtrip.py: do not use cStringIO
cStringIO is not offered by python3, so avoid using using this module.
this file does not exist in master anymore, so this change is not
cherry-picked from master.
Signed-off-by: Kefu Chai <kchai@redhat.com>
Kyr Shatskyy [Sat, 15 Feb 2020 11:05:44 +0000 (12:05 +0100)]
qa/tasks/util/rgw: get rid of cString for py3
Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
(cherry picked from commit
683421ea24bbed4ba72ea96a9055134bed554696 )
Kyr Shatskyy [Sat, 15 Feb 2020 10:05:01 +0000 (11:05 +0100)]
qa/tasks/rgw: fix imports for py3
Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
(cherry picked from commit
eec9479f6d9ee0ed8dfa705491159d49a89bec19 )
Kyr Shatskyy [Sat, 14 Dec 2019 00:16:34 +0000 (01:16 +0100)]
qa/tasks: fix imports for py3 compatibility
Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
(cherry picked from commit
e46eb8348e0639ea162b7e224bca40e0257ad6ef )
Kyr Shatskyy [Fri, 13 Dec 2019 23:32:07 +0000 (00:32 +0100)]
qa/tasks/ceph_manager: get rid of CStringIO for py3
Use io.BytesIO instead cStringIO.StringIO for py3 compatibility
Signed-off-by: Kefu Chai <kchai@redhat.com>
Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
(cherry picked from commit
204ceee156cbb8a20bdf56efb0cd0610ee4c107e )
Conflicts:
qa/tasks/ceph_manager.py: trivial resolution
Kefu Chai [Fri, 27 Mar 2020 03:39:24 +0000 (11:39 +0800)]
qa/tasks: use spaces intead of tabs for indent
to address the errors of
```
TabError: inconsistent use of tabs and spaces in indentation
```
somehow in master, we are using spaces instead of tabs, so this change
is not cherry-picked from master.
Signed-off-by: Kefu Chai <kchai@redhat.com>
Kyr Shatskyy [Mon, 7 Oct 2019 14:09:05 +0000 (16:09 +0200)]
tests: use python3 compatible print
Fixes: https://tracker.ceph.com/issues/42210
Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
(cherry picked from commit
7e87f80a8754c93c10ff937844ad456d4a236f57 )
Conflicts:
qa/tasks/cephfs/mount.py
qa/tasks/cephfs/test_journal_migration.py
qa/workunits/mon/caps.py
src/test/rgw/rgw_multi/tests_ps.py
src/test/rgw/rgw_multi/zone_ps.py
src/test/rgw/test_multi.py: trivial resolutions
Kyr Shatskyy [Mon, 16 Dec 2019 01:20:11 +0000 (02:20 +0100)]
qa/tasks/cephfs: get rid of StringIO for py3
Use io.BytesIO and six.ensure_str for py3 compatibility
Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
(cherry picked from commit
9f6c764f10f99cbf5ca164c2681b001d29505d9d )
Conflicts:
qa/tasks/cephfs/fuse_mount.py
qa/tasks/cephfs/mount.py
qa/tasks/cephfs/test_acls.py
qa/tasks/cephfs/test_cephfs_shell.py
qa/tasks/cephfs/test_journal_migration.py
qa/tasks/cephfs/xfstests_dev.py: trivial resolution
Kefu Chai [Thu, 26 Mar 2020 06:33:06 +0000 (14:33 +0800)]
qa/tasks/mgr: partial revert of 'import with full path'
this change partially reverts #34139
using relative import helps with readability and ease the pain to write
down the full parent module name
in #34139, all relative imports were replaced with full path, because we
were using following code to verify if the code is python3 compatible:
```
mod_spec = importlib.util.spec_from_file_location(mod_name, path)
mod = importlib.util.module_from_spec(mod_spec)
mod_spec.loader.exec_module(mod)
```
but this does not work with submodule which can import using relative
import without specifying the name of the package and its parent module.
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit
b0bdbc34147c7e795e1a01cce1197b990c48effb )
Conflicts:
qa/tasks/mgr/dashboard/test_auth.py
qa/tasks/mgr/dashboard/test_cephfs.py
qa/tasks/mgr/dashboard/test_crush_rule.py
qa/tasks/mgr/dashboard/test_host.py
qa/tasks/mgr/dashboard/test_orchestrator.py
qa/tasks/mgr/dashboard/test_user.py: trivial resolutions
Casey Bodley [Wed, 25 Mar 2020 20:19:15 +0000 (16:19 -0400)]
qa/rgw: partial revert of 'import with full path'
Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit
aa60edcec89b1538070b316c496e55bd0e15f966 )
Conflicts:
src/test/rgw/rgw_multi/tests_az.py
src/test/rgw/rgw_multi/tests_ps.py
src/test/rgw/rgw_multi/zone_az.py: trivial resolution
Kefu Chai [Wed, 25 Mar 2020 13:47:54 +0000 (21:47 +0800)]
test/rgw: should import parse not urlparse
urlparse is a function while parse is a submodule where parse_qsl() is
provided
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit
0db88f775b204b44d5c7b3c50e5ad3fffad029f1 )
Kefu Chai [Tue, 24 Mar 2020 08:33:57 +0000 (16:33 +0800)]
qa: import py3 compatible modules using six
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit
80b71ef461043bfa274b2c73fb0697a0e75759cd )
Conflicts:
qa/tasks/barbican.py
qa/tasks/vault.py: trivial resolution
Kefu Chai [Tue, 24 Mar 2020 08:33:22 +0000 (16:33 +0800)]
qa: import with full path
to be py3 compatible
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit
947a74349d2ce1266cb0f3c6a7030605999e21b3 )
Conflicts:
qa/tasks/cephadm.py
qa/tasks/cephfs/test_acls.py
qa/tasks/cephfs/test_openfiletable.py
qa/tasks/cram.py
qa/tasks/mgr/dashboard/test_auth.py
qa/tasks/mgr/dashboard/test_cephfs.py
qa/tasks/mgr/dashboard/test_crush_rule.py
qa/tasks/mgr/dashboard/test_host.py
qa/tasks/mgr/dashboard/test_orchestrator.py
qa/tasks/mgr/dashboard/test_rbd_mirroring.py
qa/tasks/mgr/dashboard/test_settings.py
qa/tasks/mgr/dashboard/test_user.py
src/test/rgw/rgw_multi/tests_az.py
src/test/rgw/rgw_multi/tests_ps.py
src/test/rgw/rgw_multi/zone_az.py: trivial resolution
Kyr Shatskyy [Tue, 17 Dec 2019 00:46:26 +0000 (01:46 +0100)]
qa/tasks/workunit: py3 compat
Use six.ensure_str for `get_file()` output in order to
make code py3 compatible
Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
(cherry picked from commit
ae6befb3be46d84da67092aff8bff95d9f646aea )
Kyr Shatskyy [Mon, 16 Dec 2019 10:35:08 +0000 (11:35 +0100)]
qa/tasks: fix import module path for py3 compat
Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
(cherry picked from commit
1c81d3873d904e42f7a534db0e419c23e5220aed )
Conflicts:
qa/tasks/mon_thrash.py
qa/tasks/workunit.py: trivial resolutions
Kyr Shatskyy [Mon, 16 Dec 2019 00:47:28 +0000 (01:47 +0100)]
qa/tasks/thrashosds: fix imports for py3
Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
(cherry picked from commit
c26ea687d48b7742eb527a77385321b0138bd634 )
Kyr Shatskyy [Sat, 15 Feb 2020 10:21:15 +0000 (11:21 +0100)]
qa/tasks/omapbench: get rid of itervalues for py3
Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
(cherry picked from commit
1140b5f027be472ff7f1c949305d5d9400cba191 )
Kyr Shatskyy [Sat, 15 Feb 2020 10:16:26 +0000 (11:16 +0100)]
qa/tasks/mgr: get rid of itervalues for py3
Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
(cherry picked from commit
eb10276c1c062a196bd0391691f6e8ef5378f5b3 )
Kyr Shatskyy [Sat, 15 Feb 2020 10:14:31 +0000 (11:14 +0100)]
qa/tasks/watch_notify_stress: get rid of itervalues for py3
Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
(cherry picked from commit
6e328edcbcab28b6d6a3abbb46b48a6a18e660c2 )
Kyr Shatskyy [Sat, 15 Feb 2020 10:13:22 +0000 (11:13 +0100)]
qa/tasks/osd_max_pg_per_osd: get rid of itervalues for py3
Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
(cherry picked from commit
b2d52220e3b7e31b16bb6442848c5ce2f9d4fc76 )
Kyr Shatskyy [Sat, 15 Feb 2020 10:07:50 +0000 (11:07 +0100)]
qa/tasks/radosbench.py: get rid of itervalues for py3 compat
Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
(cherry picked from commit
3b21067bbbf5e375700554e8b985bc4762d03a46 )
Kyr Shatskyy [Tue, 26 Nov 2019 12:21:15 +0000 (13:21 +0100)]
qa/tasks/ceph: get rid of cStringIO for py3 compat
Use io.BytesIO instead of cStringIO.StringIO
Use six.ensure_str whenever it needs to convert binary to str.
Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
(cherry picked from commit
35cf5131e7152ce20d916aa99c124751d6a97f5c )
Kyr Shatskyy [Fri, 21 Feb 2020 18:35:15 +0000 (19:35 +0100)]
qa/tasks/admin_socket: get rid of cStringIO for py3
Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
(cherry picked from commit
3eb341db27290d01417d7809b198bd17a7f5fa3a )
Kyr Shatskyy [Fri, 21 Feb 2020 19:59:47 +0000 (20:59 +0100)]
qa/tasks/systemd: get rid of cStringIO for py3
Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
(cherry picked from commit
a28d3473055ca1440949f3fb99161246f8bb71b1 )
Kyr Shatskyy [Fri, 21 Feb 2020 20:10:59 +0000 (21:10 +0100)]
qa/tasks/scrub_test: get rid of cStringIO for py3
Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
(cherry picked from commit
1d6c4228cd83ad930119f77a22feae2d3df57589 )
Kyr Shatskyy [Fri, 21 Feb 2020 20:19:08 +0000 (21:19 +0100)]
qa/tasks/netem: get rid of cStringIO for py3
Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
(cherry picked from commit
fa3db2529fb1b7f9f5145d3d8752d38b439a32f8 )
Thomas Bechtold [Mon, 9 Dec 2019 15:17:23 +0000 (16:17 +0100)]
qa: Enable flake8 tox and fix failures
There were a couple of problems found by flake8 in the qa/
directory (most of them fixed now). Enabling flake8 during the usual
check runs hopefully avoids adding new issues in the future.
Signed-off-by: Thomas Bechtold <tbechtold@suse.com>
(cherry picked from commit
0127cd1e8817b05b1c3150540b021f9a24b47089 )
Conflicts:
qa/tasks/barbican.py
qa/tasks/cephadm.py
qa/tasks/cephfs/test_cephfs_shell.py
qa/tasks/cephfs/xfstests_dev.py
qa/tasks/daemonwatchdog.py
qa/tasks/mgr/dashboard/test_cephfs.py
qa/tasks/mgr/dashboard/test_orchestrator.py
qa/tasks/mgr/dashboard/test_rbd.py
qa/tasks/mgr/mgr_test_case.py
qa/tasks/mgr/test_orchestrator_cli.py
qa/tasks/s3tests.py
qa/tasks/s3tests_java.py
qa/tasks/vstart_runner.py
qa/workunits/mon/caps.py: trivial resolutions,
and drop the the change to qa/CMakeLists.txt, as we don't have
add_tox_test() back in nautilus
Kyr Shatskyy [Fri, 21 Feb 2020 20:29:30 +0000 (21:29 +0100)]
qa/tasks: get rid of cStringIO for py3
Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
(cherry picked from commit
99e9e82d646a9db1773ca97da7460dbfb5a0b415 )
Kyr Shatskyy [Fri, 21 Feb 2020 20:36:48 +0000 (21:36 +0100)]
qa/tasks: get rid of cStringIO for py3
Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
(cherry picked from commit
71ada20a0e362db3cb5ce2a4afa753082f62f9cd )
Kyr Shatskyy [Fri, 21 Feb 2020 21:17:09 +0000 (22:17 +0100)]
qa/tasks/reg11184: get rid of cStringIO for py3
Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
(cherry picked from commit
fa16954df94a763d2604f58c119b8ee943fa2cfe )
Kyr Shatskyy [Fri, 21 Feb 2020 21:23:11 +0000 (22:23 +0100)]
qa/tasks/radosbenchsweep: get rid of cStringIO for py3
Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
(cherry picked from commit
7ffcd00b652b955f52df7a27ce2130cbc40ebd72 )
Kyr Shatskyy [Fri, 21 Feb 2020 21:28:56 +0000 (22:28 +0100)]
qa/tasks/divergent_priors2: get rid of cStringIO for py3
Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
(cherry picked from commit
b6eefbb02896043333f264023274e83ec36b8362 )
Kyr Shatskyy [Fri, 21 Feb 2020 21:46:31 +0000 (22:46 +0100)]
qa/tasks/ceph_objectstore_tool: get rid of cStringIO for py3
Signed-off-by: Kefu Chai <kchai@redhat.com>
Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
(cherry picked from commit
b502bc17d17c784b83f652b79f04eccfd1048805 )
Kyr Shatskyy [Tue, 25 Feb 2020 15:45:00 +0000 (16:45 +0100)]
qa/tasks/ceph_manager: ensure str for py3 compat
Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
(cherry picked from commit
4c992baf251d272800e76bb40584f169163f6c1b )
Kyr Shatskyy [Mon, 2 Mar 2020 14:43:41 +0000 (15:43 +0100)]
qa/tasks/vstart_runner: use io.BytesIO for py3 compat
Use io.BytesIO instead of StringIO for py3 compatibility.
Signed-off-by: Kefu Chai <kchai@redhat.com>
Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
(cherry picked from commit
49592af4005808db4ed5301e9072525bd709f44a )
Conflicts:
qa/tasks/vstart_runner.py: trivial resolution
Rishabh Dave [Tue, 7 Jan 2020 10:15:15 +0000 (10:15 +0000)]
vstart_runnner: add sh method to LocalRemote
The method is a wrapper of teuthology.misc.sh
Fixes: https://tracker.ceph.com/issues/43496
Signed-off-by: Rishabh Dave <ridave@gmail.com>
(cherry picked from commit
b7d740ede7ff5839fdce32a5bfc78ca935990208 )
Kyr Shatskyy [Sat, 15 Feb 2020 10:07:22 +0000 (11:07 +0100)]
qa/tasks/manypools: get rid of itervalues for py3 compat
Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
(cherry picked from commit
5f876961ef584ab07c8f9ef50f10f010a5e7510f )
Conflicts:
qa/tasks/manypools.py: trivial resolution
Kyr Shatskyy [Fri, 21 Feb 2020 18:18:43 +0000 (19:18 +0100)]
qa/tasks/ceph_deploy: get rid of cStringIO for py3
Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
(cherry picked from commit
982ba399b34765ca888dafbbf4221bab53e7964a )
Kyr Shatskyy [Tue, 8 Oct 2019 14:41:32 +0000 (16:41 +0200)]
tasks/ceph: get rid of iteritems for python3
For python3 compatibility use items() instead of iteritems().
Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
(cherry picked from commit
9b5bd6c7155579d3b903ef0eb0ac8eddfe8f29e1 )
Yuri Weinstein [Mon, 1 Jun 2020 20:48:08 +0000 (13:48 -0700)]
Merge pull request #35305 from tchaikov/nautilus-qa-rgw-s3a-hadoop
nautilus: qa/rgw: s3a-hadoop task defaults to maven-version 3.6.3
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Yuri Weinstein <yweinste@redhat.com>
Yuri Weinstein [Mon, 1 Jun 2020 20:47:14 +0000 (13:47 -0700)]
Merge pull request #35181 from smithfarm/wip-45644-nautilus
nautilus: rgw/notifications: version id was not sent in versioned buckets
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Yuri Weinstein [Mon, 1 Jun 2020 20:46:49 +0000 (13:46 -0700)]
Merge pull request #35162 from tchaikov/nautilus-qa-keystone
nautilus: qa/keystone: use bindep to discover keystone's dependencies
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Yuri Weinstein <yweinste@redhat.com>
Yuri Weinstein [Mon, 1 Jun 2020 19:33:38 +0000 (12:33 -0700)]
Merge pull request #35319 from neha-ojha/wip-45772-nautilus
nautilus: qa/suites/upgrade/nautilus-p2: disable more min pg per osd warnings
Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
Reviewed-by: Yuri Weinstein <yweinste@redhat.com>
Yuri Weinstein [Mon, 1 Jun 2020 19:30:00 +0000 (12:30 -0700)]
Merge pull request #35248 from rhcs-dashboard/wip-45582-nautilus
nautilus: mgr/dashboard/grafana: Add rbd-image details dashboard
Yuri Weinstein [Mon, 1 Jun 2020 19:10:41 +0000 (12:10 -0700)]
Merge pull request #35199 from smithfarm/wip-45600-nautilus
nautilus: mds: don't shallow copy when decoding xattr map
Reviewed-by: Yan, Zheng <zyan@redhat.com>
Reviewed-by: Ramana Raja <rraja@redhat.com>
Yuri Weinstein [Mon, 1 Jun 2020 19:10:00 +0000 (12:10 -0700)]
Merge pull request #35185 from smithfarm/wip-45497-nautilus
nautilus: cephfs/tools: add accounted_rstat/rstat when building file dentry
Reviewed-by: Ramana Raja <rraja@redhat.com>
Reviewed-by: Yan, Zheng <zyan@redhat.com>
Yuri Weinstein [Mon, 1 Jun 2020 19:09:18 +0000 (12:09 -0700)]
Merge pull request #35163 from tchaikov/nautilus-upgrade-from-luminous-fs-disable-too-few-pgs
nautilus: qa/suites/fs/upgrade: disable mon_pg_warn_min_per_osd
Reviewed-by: Ramana Raja <rraja@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Yuri Weinstein <yweinste@redhat.com>
Yuri Weinstein [Mon, 1 Jun 2020 19:04:54 +0000 (12:04 -0700)]
Merge pull request #35149 from Vicente-Cheng/wip-45602-nautilus
nautilus: mds: Handle blacklisted error in purge queue
Reviewed-by: Ramana Raja <rraja@redhat.com>
Yuri Weinstein [Mon, 1 Jun 2020 19:04:13 +0000 (12:04 -0700)]
Merge pull request #35118 from Vicente-Cheng/wip-45478-nautilus
nautilus: client: only set MClientCaps::FLAG_SYNC when flushing dirty auth caps
Reviewed-by: Ramana Raja <rraja@redhat.com>
Reviewed-by: Jeff Layton <jlayton@redhat.com>
Yuri Weinstein [Mon, 1 Jun 2020 19:03:23 +0000 (12:03 -0700)]
Merge pull request #35117 from Vicente-Cheng/wip-45474-nautilus
nautilus: bash_completion: Do not auto complete obsolete and hidden cmds
Reviewed-by: Ramana Raja <rraja@redhat.com>
Neha Ojha [Fri, 29 May 2020 17:13:55 +0000 (17:13 +0000)]
qa/suites/upgrade/nautilus-p2p: disable more min pg per osd warnings
This follows
58eb3edc8478c993c5446475df58d659d3f6d356 and
b75907e7575dbdc5888c198f354cb5f71bf21ab3 .
This change is not cherry-picked from master since it already has
1ac34a5ea3d1aca299b02e574b295dd4bf6167f4 .
Fixes: https://tracker.ceph.com/issues/45772
Signed-off-by: Neha Ojha <nojha@redhat.com>
Casey Bodley [Mon, 13 Jan 2020 19:15:01 +0000 (14:15 -0500)]
qa/rgw: s3a-hadoop task defaults to maven-version 3.6.3
binaries for v3.6.2 are no longer available under
http://www-us.apache.org/dist/maven/maven-3/
Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit
82351b9874a9bb5e2e07436303be34e9f5db0ae5 )
Conflicts:
qa/tasks/s3a_hadoop.py: trivial resolution
Yuri Weinstein [Thu, 28 May 2020 20:22:22 +0000 (13:22 -0700)]
Merge pull request #35214 from shyukri/wip-43990-nautilus
nautilus: mgr/insights: fix prune-health-history
Reviewed-by: Neha Ojha <nojha@redhat.com>
Yuri Weinstein [Thu, 28 May 2020 20:21:55 +0000 (13:21 -0700)]
Merge pull request #35213 from shyukri/wip-43464-nautilus
nautilus: mgr: close restful socket after exec
Reviewed-by: Neha Ojha <nojha@redhat.com>
Yuri Weinstein [Thu, 28 May 2020 20:07:35 +0000 (13:07 -0700)]
Merge pull request #35212 from shyukri/wip-43098-nautilus
nautilus: mgr/dashboard: Display the aggregated number of request
Reviewed-by: Stephan Müller <smueller@suse.com>
Yuri Weinstein [Thu, 28 May 2020 20:06:35 +0000 (13:06 -0700)]
Merge pull request #35211 from shyukri/wip-45469-nautilus
nautilus: monitoring: Fix "10% OSDs down" alert description
Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Patrick Seidensal <pnawracay@suse.com>
Yuri Weinstein [Thu, 28 May 2020 20:05:39 +0000 (13:05 -0700)]
Merge pull request #35174 from smithfarm/wip-45637-nautilus
nautilus: mgr/dashboard: install teuthology using pip
Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Enno Gotthold [Tue, 28 Apr 2020 11:34:16 +0000 (13:34 +0200)]
mgr/dashboard: Remove additional unneeded steps for the metrics calculation
Signed-off-by: Enno Gotthold <egotthold@suse.de>
(cherry picked from commit
dfb1e0020ed8130a2276be1ca94d8e7d7f931273 )
Enno Gotthold [Wed, 18 Mar 2020 12:28:39 +0000 (13:28 +0100)]
doc/mgr/prometheus: Change images to rbd-enabled pools
Signed-off-by: Enno Gotthold <egotthold@suse.de>
(cherry picked from commit
db76547c8d829e529dcebccde100fca438d64446 )
Enno Gotthold [Wed, 18 Mar 2020 11:50:06 +0000 (12:50 +0100)]
mgr/prometheus: Add config value to honor ceph config in prometheus
Signed-off-by: Enno Gotthold <egotthold@suse.de>
Author: Ernesto Puerta <epuertat@redhat.com>
(cherry picked from commit
6d5f88450e61122016fcf7b6cf9431dc67128d3d )
Yuri Weinstein [Tue, 26 May 2020 18:24:32 +0000 (11:24 -0700)]
Merge pull request #35183 from smithfarm/wip-45579-nautilus
nautilus: pybind/rbd: RBD.create() method's 'old_format' parameter now defaults to False
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: Mykola Golub <mgolub@mirantis.com>
Yuri Weinstein [Tue, 26 May 2020 18:23:49 +0000 (11:23 -0700)]
Merge pull request #35182 from smithfarm/wip-45577-nautilus
nautilus: librbd: copy API should not inherit v1 image format by default
Reviewed-by: Mykola Golub <mgolub@mirantis.com>
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Yuri Weinstein [Tue, 26 May 2020 18:22:26 +0000 (11:22 -0700)]
Merge pull request #35086 from tspmelo/wip-45540-nautilus
nautilus: mgr/dashboard: Fix HomeTest setup
Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Kiefer Chang <kiefer.chang@suse.com>
Reviewed-by: Tatjana Dehler <tdehler@suse.com>
Yuri Weinstein [Tue, 26 May 2020 18:20:48 +0000 (11:20 -0700)]
Merge pull request #35137 from shyukri/wip-45208-nautilus
nautilus: monitoring: alert for pool fill up broken
Reviewed-by: Kiefer Chang <kiefer.chang@suse.com>
Reviewed-by: Patrick Seidensal <pnawracay@suse.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
Enno G [Fri, 20 Mar 2020 08:19:01 +0000 (09:19 +0100)]
doc: Add information on how to enable the rbd-images dashboard
Fixes: https://tracker.ceph.com/issues/44623
Signed-off-by: Enno Gotthold <egotthold@suse.de>
In the previous commit (
1c52ee2b ) the added dashboard will stay empty
until it is manually enabled to display information.
(cherry picked from commit
6386095e51a1d58fa0093d37b26df25c524b72bc )
Conflicts:
doc/cephadm/monitoring.rst
- Delete (file doesn't exist in nautilus)
Enno Gotthold [Wed, 18 Mar 2020 12:30:18 +0000 (13:30 +0100)]
mgr/dashboard: Add grafana chart for rbd image details
Fixes: https://tracker.ceph.com/issues/44623
Signed-off-by: Enno Gotthold <egotthold@suse.de>
This dashboard will per default be empty as the already existing
dashboard with the summary for all rbd images.
(cherry picked from commit
9707cb30cbbfc0f7c669e19fb9d2482ea422993c )
Sage Weil [Thu, 30 Jan 2020 17:40:48 +0000 (11:40 -0600)]
mgr/insights: make 'insights prune-health-history 0' zap current state
The self._health_slot value needs to be updated too if the current key
is removed.
Fixes: https://tracker.ceph.com/issues/43886
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit
04f25b26c5aea5b4cf5cb94e939d6fba74228b27 )
liushi [Mon, 23 Dec 2019 09:09:29 +0000 (17:09 +0800)]
mgr: close restful socket after exec
Signed-off-by: liushi <liu.shi@navercorp.com>
(cherry picked from commit
ec3a696a5d328936b611b2a19fc9ab12ae183b48 )
Tiago Melo [Mon, 4 Nov 2019 16:18:27 +0000 (15:18 -0100)]
mgr/dashboard: Display the aggregated number of request
convertTimeSeries will now calculate the aggregated total number of client
request made in the last seconds, instead of the number of request per second.
Fixes: https://tracker.ceph.com/issues/42622
Signed-off-by: Tiago Melo <tmelo@suse.com>
(cherry picked from commit
1dc483e8d9699a57ef61ea77d4a54ce93b341b17 )
Benoît Knecht [Thu, 30 Apr 2020 08:50:07 +0000 (10:50 +0200)]
monitoring: Fix "10% OSDs down" alert description
The alert was triggered when less than 90% of OSDs were _up_, but then the
description took that value and described it as the percentage of OSDs being
_down_. So with 12% of OSDs down, the alert description would read:
```
88% or 88 of 100 OSDs are down (>=10%).
```
which can be panic-inducing.
This commit changes the alert expression to actually compute the ratio of OSDs
being down, which makes the correct value appear in the description.
Signed-off-by: Benoît Knecht <bknecht@protonmail.ch>
(cherry picked from commit
653c3f66823179fc5b9cbb74ff932d61a6c4178c )
Yuri Weinstein [Fri, 22 May 2020 18:58:48 +0000 (11:58 -0700)]
Merge pull request #35180 from smithfarm/wip-45642-nautilus
nautilus: tests: src/test/compressor: Add missing gtest
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Willem Jan Withagen <wjw@digiware.nl>
Yuri Weinstein [Fri, 22 May 2020 18:53:02 +0000 (11:53 -0700)]
Merge pull request #35047 from smithfarm/wip-44686-nautilus
nautilus: qa/standalone/osd/osd-backfill-stats.sh: get_latest_osdmap to propagate map change
Reviewed-by: David Zafman <dzafman@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Yuri Weinstein [Fri, 22 May 2020 18:46:57 +0000 (11:46 -0700)]
Merge pull request #35049 from smithfarm/wip-45224-nautilus
nautilus: ceph_test_rados_api_{watch_notify,misc}: tolerate some timeouts
Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
Yuri Weinstein [Fri, 22 May 2020 18:45:50 +0000 (11:45 -0700)]
Merge pull request #35048 from smithfarm/wip-44689-nautilus
nautilus: test: Add flush_pg_stats to avoid race with getting num_shards_repaired
Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: David Zafman <dzafman@redhat.com>
Yuri Weinstein [Fri, 22 May 2020 18:42:28 +0000 (11:42 -0700)]
Merge pull request #35028 from shyukri/wip-44163-nautilus
nautilus:test/fio: bump to fio 3.15
Reviewed-by: Igor Fedotov <ifedotov@suse.com>
Yuri Weinstein [Fri, 22 May 2020 18:40:25 +0000 (11:40 -0700)]
Merge pull request #35024 from smithfarm/wip-43919-nautilus
nautilus: osd: dispatch_context and queue split finish on early bail-out
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Yuri Weinstein [Fri, 22 May 2020 18:39:30 +0000 (11:39 -0700)]
Merge pull request #34957 from smithfarm/wip-44841-nautilus
nautilus: osd/PeeringState: do not trim pg log past last_update_ondisk
Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Yuri Weinstein [Fri, 22 May 2020 18:38:11 +0000 (11:38 -0700)]
Merge pull request #34823 from votdev/wip-45323-nautilus
nautilus: mgr/dashboard: monitoring menu entry should indicate firing alerts
Reviewed-by: Patrick Seidensal <pnawracay@suse.com>
Reviewed-by: Stephan Müller <smueller@suse.com>
Yuri Weinstein [Fri, 22 May 2020 15:31:20 +0000 (08:31 -0700)]
Merge pull request #35050 from smithfarm/wip-43773-nautilus
nautilus: qa: log warning on scrub error
Reviewed-by: Ramana Raja <rraja@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
Yuri Weinstein [Fri, 22 May 2020 15:30:41 +0000 (08:30 -0700)]
Merge pull request #35000 from smithfarm/wip-45496-nautilus
nautilus: cephfs: Client: fix Finisher assert failure
Reviewed-by: Xiubo Li <xiubli@redhat.com>
Reviewed-by: Ramana Raja <rraja@redhat.com>
Yuri Weinstein [Fri, 22 May 2020 15:29:21 +0000 (08:29 -0700)]
Merge pull request #34784 from Vicente-Cheng/wip-45221-nautilus
nautilus: cephfs-journal-tool: correctly parse --dry_run argument
Reviewed-by: Ramana Raja <rraja@redhat.com>
Yuri Weinstein [Fri, 22 May 2020 15:28:40 +0000 (08:28 -0700)]
Merge pull request #34783 from Vicente-Cheng/wip-45217-nautilus
nautilus: qa/cephfs: update TestClusterFull:test_barrier
Reviewed-by: Ramana Raja <rraja@redhat.com>
Yuri Weinstein [Fri, 22 May 2020 15:28:12 +0000 (08:28 -0700)]
Merge pull request #34435 from Vicente-Cheng/wip-44483-nautilus
nautilus: mds: handle ceph_assert on blacklisting
Reviewed-by: Ramana Raja <rraja@redhat.com>