Skip to content

Commit

Permalink
Merge PR #53873 into main
Browse files Browse the repository at this point in the history
* refs/pull/53873/head:
	qa: typo fix when checking for perf counter - s/md_thresh_evicted/mdthresh_evicted
	qa: lower mds_session_metadata_threshold for tests

Reviewed-by: Milind Changire <mchangir@redhat.com>
Reviewed-by: Rishabh Dave <ridave@redhat.com>
Reviewed-by: Leonid Usov <leonid.usov@ibm.com>
  • Loading branch information
vshankar committed Oct 9, 2023
2 parents 6ed5a28 + 5856a1e commit 1568321
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
1 change: 1 addition & 0 deletions .githubmap
Original file line number Diff line number Diff line change
Expand Up @@ -175,3 +175,4 @@ phlogistonjohn John Mulligan <jmulligan@redhat.com>
baergj Joshua Baergen <jbaergen@digitalocean.com>
zmc Zack Cerza <zack@redhat.com>
robbat2 Robin H. Johnson <robbat2@orbis-terrarum.net>
leonid-s-usov Leonid Usov <leonid.usov@ibm.com>
13 changes: 6 additions & 7 deletions qa/tasks/cephfs/test_client_limits.py
Original file line number Diff line number Diff line change
Expand Up @@ -272,20 +272,19 @@ def test_client_blocklisted_oldest_tid(self):
# Wait for the health warnings. Assume mds can handle 10 request per second at least
self.wait_for_health("MDS_CLIENT_OLDEST_TID", max_requests // 10, check_in_detail=str(self.mount_a.client_id))

# why a multiplier of 20, you may ask - I arrieved at this from some debugs
# that I put when testing the fix in a vstart cluster where its a ratio of
# encoded session information to the number of completed requests.
self.config_set('mds', 'mds_session_metadata_threshold', max_requests*20);
# set the threshold low so that it has a high probability of
# hitting.
self.config_set('mds', 'mds_session_metadata_threshold', 5000);

# Create a few more files synchronously. This would hit the session metadata threshold
# Create lot many files synchronously. This would hit the session metadata threshold
# causing the client to get blocklisted.
with self.assertRaises(CommandFailedError):
self.mount_a.create_n_files("testdir/file2", 20, True)
self.mount_a.create_n_files("testdir/file2", 100000, True)

self.mds_cluster.is_addr_blocklisted(self.mount_a.get_global_addr())
# the mds should bump up the relevant perf counter
pd = self.perf_dump()
self.assertGreater(pd['mds_sessions']['md_thresh_evicted'], 0)
self.assertGreater(pd['mds_sessions']['mdthresh_evicted'], 0)

# reset the config
self.config_set('client', 'client inject fixed oldest tid', 'false')
Expand Down

0 comments on commit 1568321

Please sign in to comment.