Skip to content

Commit

Permalink
Merge PR #32505 into master
Browse files Browse the repository at this point in the history
* refs/pull/32505/head:
	mds: note client features when rejecting client
	mds: add hex indicator to printed feature flags

Reviewed-by: Zheng Yan <zyan@redhat.com>
  • Loading branch information
batrick committed Jan 14, 2020
2 parents 53728ae + 86a0e87 commit df9833e
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
5 changes: 3 additions & 2 deletions src/mds/Server.cc
Original file line number Diff line number Diff line change
Expand Up @@ -597,8 +597,9 @@ void Server::handle_client_session(const cref_t<MClientSession> &m)
stringstream ss;
ss << "missing required features '" << missing_features << "'";
send_reject_message(ss.str());
mds->clog->warn() << "client session lacks required features '"
<< missing_features << "' denied (" << session->info.inst << ")";
mds->clog->warn() << "client session (" << session->info.inst
<< ") lacks required features " << missing_features
<< "; client supports " << client_metadata.features;
session->clear();
break;
}
Expand Down
1 change: 1 addition & 0 deletions src/mds/mdstypes.cc
Original file line number Diff line number Diff line change
Expand Up @@ -441,6 +441,7 @@ void feature_bitset_t::dump(Formatter *f) const {
void feature_bitset_t::print(ostream& out) const
{
std::ios_base::fmtflags f(out.flags());
out << "0x";
for (int i = _vec.size() - 1; i >= 0; --i)
out << std::setfill('0') << std::setw(sizeof(block_type) * 2)
<< std::hex << _vec[i];
Expand Down

0 comments on commit df9833e

Please sign in to comment.