From: Tatjana Dehler <tdehler@suse.com>
Date: Fri, 11 Jan 2019 06:12:07 +0000 (+0100)
Subject: mgr/dashboard: Provide all four 'mandatory' flags
X-Git-Tag: v14.1.0~410^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=613ea569f3f7e9e8bebeb9237a2f3697ccbd452d;p=ceph.git

mgr/dashboard: Provide all four 'mandatory' flags

Fixes: https://tracker.ceph.com/issues/37857
Signed-off-by: Tatjana Dehler <tdehler@suse.com>
---

diff --git a/qa/tasks/mgr/dashboard/test_osd.py b/qa/tasks/mgr/dashboard/test_osd.py
index 46a773060a38..453c77485d2e 100644
--- a/qa/tasks/mgr/dashboard/test_osd.py
+++ b/qa/tasks/mgr/dashboard/test_osd.py
@@ -123,7 +123,8 @@ class OsdFlagsTest(DashboardTestCase):
     def __init__(self, *args, **kwargs):
         super(OsdFlagsTest, self).__init__(*args, **kwargs)
         self._initial_flags = sorted(  # These flags cannot be unset
-            ['sortbitwise', 'recovery_deletes', 'purged_snapdirs'])
+            ['sortbitwise', 'recovery_deletes', 'purged_snapdirs',
+             'pglog_hardlimit'])
 
     @classmethod
     def _get_cluster_osd_flags(cls):
@@ -139,17 +140,17 @@ class OsdFlagsTest(DashboardTestCase):
     def test_list_osd_flags(self):
         flags = self._get('/api/osd/flags')
         self.assertStatus(200)
-        self.assertEqual(len(flags), 3)
+        self.assertEqual(len(flags), 4)
         self.assertEqual(sorted(flags), self._initial_flags)
 
     def test_add_osd_flag(self):
         flags = self._put_flags([
             'sortbitwise', 'recovery_deletes', 'purged_snapdirs', 'noout',
-            'pause'
+            'pause', 'pglog_hardlimit'
         ])
         self.assertEqual(flags, sorted([
             'sortbitwise', 'recovery_deletes', 'purged_snapdirs', 'noout',
-            'pause'
+            'pause', 'pglog_hardlimit'
         ]))
 
         # Restore flags
diff --git a/src/pybind/mgr/dashboard/controllers/osd.py b/src/pybind/mgr/dashboard/controllers/osd.py
index e2bb83665510..54c6c5560230 100644
--- a/src/pybind/mgr/dashboard/controllers/osd.py
+++ b/src/pybind/mgr/dashboard/controllers/osd.py
@@ -201,7 +201,7 @@ class OsdFlagsController(RESTController):
         """
         The `recovery_deletes`, `sortbitwise` and `pglog_hardlimit` flags cannot be unset.
         `purged_snapshots` cannot even be set. It is therefore required to at
-        least include those three flags for a successful operation.
+        least include those four flags for a successful operation.
         """
         assert isinstance(flags, list)