From 04d5da7eeef9984cd0b9d826cb2178e97677f5c9 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Stephan=20M=C3=BCller?= Date: Tue, 14 Jan 2020 14:38:03 +0100 Subject: [PATCH] mgr/dashbaord: Fix E2E pools page failure MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit The problem was that pg autoscaling is set to "on" by default. Therefore the pg_num field is hidden, which caused the error. Now the test sets the pg autoscaling to "off" revealing the pg_num field to make the tests pass. Fixes: https://tracker.ceph.com/issues/43594 Fixes: https://tracker.ceph.com/issues/43102 Signed-off-by: Stephan Müller --- src/pybind/mgr/dashboard/frontend/e2e/pools/pools.po.ts | 2 ++ src/pybind/mgr/dashboard/run-frontend-e2e-tests.sh | 7 ------- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/src/pybind/mgr/dashboard/frontend/e2e/pools/pools.po.ts b/src/pybind/mgr/dashboard/frontend/e2e/pools/pools.po.ts index 66072b0243d..bda20d6f5f1 100644 --- a/src/pybind/mgr/dashboard/frontend/e2e/pools/pools.po.ts +++ b/src/pybind/mgr/dashboard/frontend/e2e/pools/pools.po.ts @@ -38,6 +38,8 @@ export class PoolPageHelper extends PageHelper { await nameInput.sendKeys(name); await this.selectOption('poolType', 'replicated'); + await this.expectSelectOption('pgAutoscaleMode', 'on'); + await this.selectOption('pgAutoscaleMode', 'off'); // To show pgNum field await $('input[name=pgNum]').sendKeys( protractor.Key.CONTROL, 'a', diff --git a/src/pybind/mgr/dashboard/run-frontend-e2e-tests.sh b/src/pybind/mgr/dashboard/run-frontend-e2e-tests.sh index 9930d45aab2..8b11db606d0 100755 --- a/src/pybind/mgr/dashboard/run-frontend-e2e-tests.sh +++ b/src/pybind/mgr/dashboard/run-frontend-e2e-tests.sh @@ -55,13 +55,6 @@ if [ "$BASE_URL" == "" ]; then # Set SSL verify to False ./bin/ceph dashboard set-rgw-api-ssl-verify False - # Disable PG autoscaling for new pools. This is a temporary workaround. - # e2e tests for pools should be adapted to remove this workaround after - # these issues are resolved: - # - https://tracker.ceph.com/issues/38227 - # - https://tracker.ceph.com/issues/42638 - ./bin/ceph config set global osd_pool_default_pg_autoscale_mode off - BASE_URL=$(./bin/ceph mgr services | jq -r .dashboard) fi -- 2.39.5