From 33dda693b8b39dd88d6ecdfdc56e0705f2f12469 Mon Sep 17 00:00:00 2001 From: Ernesto Puerta Date: Fri, 11 Mar 2022 17:29:07 +0100 Subject: [PATCH] mgr/dashboard: fix wrong pg status processing Fixes: https://tracker.ceph.com/issues/54481 Signed-off-by: Ernesto Puerta (cherry picked from commit 206dd9d4a71a70c46972597a838fda05ceec03da) --- .../frontend/src/app/ceph/shared/pg-category.service.spec.ts | 1 + .../frontend/src/app/ceph/shared/pg-category.service.ts | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/shared/pg-category.service.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/shared/pg-category.service.spec.ts index 302c3e202c6f3..2b3e2975c4f87 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/shared/pg-category.service.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/shared/pg-category.service.spec.ts @@ -35,6 +35,7 @@ describe('PgCategoryService', () => { it(PgCategory.CATEGORY_WORKING, () => { testMethod('clean+scrubbing', PgCategory.CATEGORY_WORKING); + testMethod('active+clean+snaptrim_wait', PgCategory.CATEGORY_WORKING); testMethod( ' 8 active+clean+scrubbing+deep, 255 active+clean ', PgCategory.CATEGORY_WORKING diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/shared/pg-category.service.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/shared/pg-category.service.ts index d9c90e8b24e90..ae178ded2769d 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/shared/pg-category.service.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/shared/pg-category.service.ts @@ -54,7 +54,7 @@ export class PgCategoryService { private getPgStatesFromText(pgStatesText: string) { const pgStates = pgStatesText - .replace(/[^a-z]+/g, ' ') + .replace(/[^a-z_]+/g, ' ') .trim() .split(' '); -- 2.39.5