Skip to content

Commit 07afb4a

Browse files
committed
Merge PR ceph#56997 into main
* refs/pull/56997/head: pybind/mgr: disable sqlite3/python autocommit qa/tasks/mgr: add tests for sqlite autocommit qa/tasks/vstart_runner: run daemons in foreground qa/tasks/vstart_runner: add missing poll method qa/suites/rados/mgr: add cli/devicehealth tasks qa: reorganize mgr unit tests qa: use position-independent link qa: add missing terminating newline pybind/mgr: add killpoint for sqlite3 database setup mgr: allow specifying module option level mon/MgrMonitor: promote standby when unsetting down flag mon/MgrMonitor: only drop active if exists Reviewed-by: Ernesto Puerta <[email protected]>
2 parents 9cc3511 + 6eacfe9 commit 07afb4a

35 files changed

+365
-224
lines changed

qa/mon_election/classic.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ overrides:
22
ceph:
33
conf:
44
global:
5-
mon election default strategy: 1
5+
mon election default strategy: 1

qa/mon_election/connectivity.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ overrides:
22
ceph:
33
conf:
44
global:
5-
mon election default strategy: 3
5+
mon election default strategy: 3

qa/suites/rados/mgr/distro

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
.qa/distros/supported-random-distro$/

qa/suites/rados/mgr/supported-random-distro$

Lines changed: 0 additions & 1 deletion
This file was deleted.

qa/suites/rados/mgr/tasks/%

Whitespace-only changes.
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
tasks:
2+
- install:
3+
extra_system_packages:
4+
rpm:
5+
- sqlite-devel
6+
deb:
7+
- sqlite3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
21
tasks:
3-
- install:
42
- ceph:
53
# tests may leave mgrs broken, so don't try and call into them
64
# to invoke e.g. pg dump during teardown.
@@ -12,6 +10,3 @@ tasks:
1210
- replacing it with standby
1311
- No standby daemons available
1412
- \(POOL_APP_NOT_ENABLED\)
15-
- cephfs_test_runner:
16-
modules:
17-
- tasks.mgr.test_failover
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
mgrmodules:
2+
sequential:
3+
- print: "Enabling mgr modules"
4+
# other fragments append to this
5+
6+
tasks:
7+
- sequential:
8+
- mgrmodules
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../.qa
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
tasks:
2+
- cephfs_test_runner:
3+
modules:
4+
- tasks.mgr.test_cli

0 commit comments

Comments
 (0)