Skip to content

Commit 1d1b0db

Browse files
committed
Merge PR ceph#62631 into main
* refs/pull/62631/head: cephfs: session tracker accounts for killing sessions Reviewed-by: Patrick Donnelly <[email protected]> Reviewed-by: Venky Shankar <[email protected]> Reviewed-by: Dhairya Parmar <[email protected]>
2 parents 9d55fa0 + bb52cb7 commit 1d1b0db

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

src/mds/SessionMap.cc

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1148,9 +1148,11 @@ int Session::check_access(CInode *in, unsigned mask,
11481148

11491149
// track total and per session load
11501150
void SessionMap::hit_session(Session *session) {
1151-
uint64_t sessions = get_session_count_in_state(Session::STATE_OPEN) +
1151+
uint64_t sessions = get_session_count_in_state(Session::STATE_OPENING) +
1152+
get_session_count_in_state(Session::STATE_OPEN) +
11521153
get_session_count_in_state(Session::STATE_STALE) +
1153-
get_session_count_in_state(Session::STATE_CLOSING);
1154+
get_session_count_in_state(Session::STATE_CLOSING) +
1155+
get_session_count_in_state(Session::STATE_KILLING);
11541156
ceph_assert(sessions != 0);
11551157

11561158
double total_load = total_load_avg.hit();

0 commit comments

Comments
 (0)