From 63c2be456d0feef4b8b21ba1996fece421de6993 Mon Sep 17 00:00:00 2001 From: Neha Ojha Date: Thu, 10 Jan 2019 19:25:32 -0500 Subject: [PATCH] qa/suites/upgrade/jewel-x: add pg log settings - vary pg log lengths - test pglog_hardlimit flag These are qa suites changes specific to luminous. Signed-off-by: Neha Ojha --- .../parallel/1.1-pg-log-overrides/normal_pg_log.yaml | 1 + .../jewel-x/parallel/1.1-pg-log-overrides/short_pg_log.yaml | 6 ++++++ .../1.1-pg-log-overrides/normal_pg_log.yaml | 1 + .../1.1-pg-log-overrides/short_pg_log.yaml | 6 ++++++ .../stress-split/1.1-pg-log-overrides/normal_pg_log.yaml | 1 + .../stress-split/1.1-pg-log-overrides/short_pg_log.yaml | 6 ++++++ .../jewel-x/stress-split/2-partial-upgrade/firsthalf.yaml | 5 +++++ .../upgrade/jewel-x/stress-split/5-finish-upgrade.yaml | 5 +++++ 8 files changed, 31 insertions(+) create mode 100644 qa/suites/upgrade/jewel-x/parallel/1.1-pg-log-overrides/normal_pg_log.yaml create mode 100644 qa/suites/upgrade/jewel-x/parallel/1.1-pg-log-overrides/short_pg_log.yaml create mode 100644 qa/suites/upgrade/jewel-x/stress-split-erasure-code/1.1-pg-log-overrides/normal_pg_log.yaml create mode 100644 qa/suites/upgrade/jewel-x/stress-split-erasure-code/1.1-pg-log-overrides/short_pg_log.yaml create mode 100644 qa/suites/upgrade/jewel-x/stress-split/1.1-pg-log-overrides/normal_pg_log.yaml create mode 100644 qa/suites/upgrade/jewel-x/stress-split/1.1-pg-log-overrides/short_pg_log.yaml diff --git a/qa/suites/upgrade/jewel-x/parallel/1.1-pg-log-overrides/normal_pg_log.yaml b/qa/suites/upgrade/jewel-x/parallel/1.1-pg-log-overrides/normal_pg_log.yaml new file mode 100644 index 00000000000..8b137891791 --- /dev/null +++ b/qa/suites/upgrade/jewel-x/parallel/1.1-pg-log-overrides/normal_pg_log.yaml @@ -0,0 +1 @@ + diff --git a/qa/suites/upgrade/jewel-x/parallel/1.1-pg-log-overrides/short_pg_log.yaml b/qa/suites/upgrade/jewel-x/parallel/1.1-pg-log-overrides/short_pg_log.yaml new file mode 100644 index 00000000000..20cc101dea1 --- /dev/null +++ b/qa/suites/upgrade/jewel-x/parallel/1.1-pg-log-overrides/short_pg_log.yaml @@ -0,0 +1,6 @@ +overrides: + ceph: + conf: + global: + osd_min_pg_log_entries: 1 + osd_max_pg_log_entries: 2 diff --git a/qa/suites/upgrade/jewel-x/stress-split-erasure-code/1.1-pg-log-overrides/normal_pg_log.yaml b/qa/suites/upgrade/jewel-x/stress-split-erasure-code/1.1-pg-log-overrides/normal_pg_log.yaml new file mode 100644 index 00000000000..8b137891791 --- /dev/null +++ b/qa/suites/upgrade/jewel-x/stress-split-erasure-code/1.1-pg-log-overrides/normal_pg_log.yaml @@ -0,0 +1 @@ + diff --git a/qa/suites/upgrade/jewel-x/stress-split-erasure-code/1.1-pg-log-overrides/short_pg_log.yaml b/qa/suites/upgrade/jewel-x/stress-split-erasure-code/1.1-pg-log-overrides/short_pg_log.yaml new file mode 100644 index 00000000000..20cc101dea1 --- /dev/null +++ b/qa/suites/upgrade/jewel-x/stress-split-erasure-code/1.1-pg-log-overrides/short_pg_log.yaml @@ -0,0 +1,6 @@ +overrides: + ceph: + conf: + global: + osd_min_pg_log_entries: 1 + osd_max_pg_log_entries: 2 diff --git a/qa/suites/upgrade/jewel-x/stress-split/1.1-pg-log-overrides/normal_pg_log.yaml b/qa/suites/upgrade/jewel-x/stress-split/1.1-pg-log-overrides/normal_pg_log.yaml new file mode 100644 index 00000000000..8b137891791 --- /dev/null +++ b/qa/suites/upgrade/jewel-x/stress-split/1.1-pg-log-overrides/normal_pg_log.yaml @@ -0,0 +1 @@ + diff --git a/qa/suites/upgrade/jewel-x/stress-split/1.1-pg-log-overrides/short_pg_log.yaml b/qa/suites/upgrade/jewel-x/stress-split/1.1-pg-log-overrides/short_pg_log.yaml new file mode 100644 index 00000000000..20cc101dea1 --- /dev/null +++ b/qa/suites/upgrade/jewel-x/stress-split/1.1-pg-log-overrides/short_pg_log.yaml @@ -0,0 +1,6 @@ +overrides: + ceph: + conf: + global: + osd_min_pg_log_entries: 1 + osd_max_pg_log_entries: 2 diff --git a/qa/suites/upgrade/jewel-x/stress-split/2-partial-upgrade/firsthalf.yaml b/qa/suites/upgrade/jewel-x/stress-split/2-partial-upgrade/firsthalf.yaml index 442dcf105a7..a73b87beb4c 100644 --- a/qa/suites/upgrade/jewel-x/stress-split/2-partial-upgrade/firsthalf.yaml +++ b/qa/suites/upgrade/jewel-x/stress-split/2-partial-upgrade/firsthalf.yaml @@ -10,3 +10,8 @@ tasks: - ceph.restart: daemons: [mon.a,mon.b,mon.c,osd.0, osd.1, osd.2] - print: "**** done ceph.restart 1st half" +- exec: + osd.0: + - ceph osd set pglog_hardlimit && exit 1 || true + - ceph osd dump --format=json-pretty | grep "flags" +- print: "**** try to set pglog_hardlimit, should not succeed" diff --git a/qa/suites/upgrade/jewel-x/stress-split/5-finish-upgrade.yaml b/qa/suites/upgrade/jewel-x/stress-split/5-finish-upgrade.yaml index 1d528cd5de7..9d5a96c6cec 100644 --- a/qa/suites/upgrade/jewel-x/stress-split/5-finish-upgrade.yaml +++ b/qa/suites/upgrade/jewel-x/stress-split/5-finish-upgrade.yaml @@ -6,4 +6,9 @@ tasks: daemons: [osd.3, osd.4, osd.5] wait-for-healthy: false wait-for-osds-up: true +- exec: + osd.0: + - ceph osd set pglog_hardlimit + - ceph osd dump --format=json-pretty | grep "flags" +- print: "**** try to set pglog_hardlimit again, should succeed" -- 2.47.3