diff options
| author | John Spray <jspray@redhat.com> | 2017-05-15 14:21:52 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-15 14:21:52 +0200 |
| commit | 17f669a868ee58eeda696fb0580bf7ed7f6d7297 (patch) | |
| tree | 93a2de332098e601c375a966cd768b52abbc06ad | |
| parent | Merge pull request #15039 from ukernel/wip-19903 (diff) | |
| parent | qa/suites/fs: fix write size calculation in full tests (diff) | |
| download | ceph-17f669a868ee58eeda696fb0580bf7ed7f6d7297.tar.xz ceph-17f669a868ee58eeda696fb0580bf7ed7f6d7297.zip | |
Merge pull request #15026 from ukernel/wip-19891
qa/suites/fs: reserve more space for mds in full tests
Reviewed-by: John Spray <john.spray@redhat.com>
| -rw-r--r-- | qa/suites/fs/basic_functional/tasks/mds-full.yaml | 7 | ||||
| -rw-r--r-- | qa/tasks/cephfs/test_full.py | 3 |
2 files changed, 7 insertions, 3 deletions
diff --git a/qa/suites/fs/basic_functional/tasks/mds-full.yaml b/qa/suites/fs/basic_functional/tasks/mds-full.yaml index 6865d83e807..53735001963 100644 --- a/qa/suites/fs/basic_functional/tasks/mds-full.yaml +++ b/qa/suites/fs/basic_functional/tasks/mds-full.yaml @@ -8,10 +8,15 @@ overrides: - failsafe disengaged, no longer dropping - is full \(reached quota conf: + mon: + mon osd nearfull ratio: 0.6 + mon osd backfillfull ratio: 0.6 + mon osd full ratio: 0.7 osd: osd mon report interval max: 5 osd objectstore: memstore - memstore device bytes: 100000000 + osd failsafe full ratio: 1.0 + memstore device bytes: 200000000 client.0: debug client: 20 debug objecter: 20 diff --git a/qa/tasks/cephfs/test_full.py b/qa/tasks/cephfs/test_full.py index 3e599566744..e69ccb373b9 100644 --- a/qa/tasks/cephfs/test_full.py +++ b/qa/tasks/cephfs/test_full.py @@ -405,8 +405,7 @@ class TestClusterFull(FullnessTestCase): # `max_avail` attribute of pools that sometimes occurs in between # tests (reason as yet unclear, but this dodges the issue) TestClusterFull.pool_capacity = self.fs.get_pool_df(self._data_pool_name())['max_avail'] - mon_osd_full_ratio = float(self.fs.get_config("mon_osd_full_ratio")) - TestClusterFull.fill_mb = int(1.05 * mon_osd_full_ratio * (self.pool_capacity / (1024.0 * 1024.0))) + TestClusterFull.fill_mb = int(1.05 * (self.pool_capacity / (1024.0 * 1024.0))) def is_full(self): return self.fs.is_full() |