RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-24 03:27:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #21941 from ukernel/wip-24053

Browse Source 
mds: reply session reject for open request from blacklisted client
This commit is contained in:
Yan, Zheng 2018-05-19 17:07:40 +08:00 committed by GitHub
commit 0edab5fcc3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
qa/tasks/cephfs/kernel_mount.py
View File

@ -124,7 +124,7 @@ class KernelMount(CephFSMount):
def cleanup(self):
pass
def umount_wait(self, force=False, require_clean=False):
def umount_wait(self, force=False, require_clean=False, timeout=900):
"""
Unlike the fuse client, the kernel client's umount is immediate
"""

3
src/mds/Server.cc
View File

@ -359,7 +359,8 @@ void Server::handle_client_session(MClientSession *m)
});
if (blacklisted) {
dout(10) << "ignoring blacklisted client " << session->info.inst.addr << dendl;
dout(10) << "rejecting blacklisted client " << session->info.inst.addr << dendl;
mds->send_message_client(new MClientSession(CEPH_SESSION_REJECT), session);
m->put();
return;
}