Merge PR #19572 into master

* refs/pull/19572/head:
	client: add log when we got unexpected flush ack

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Zheng Yan <zyan@redhat.com>
This commit is contained in:
Patrick Donnelly 2018-01-09 16:56:27 -08:00
commit 6a97e25497
No known key found for this signature in database
GPG Key ID: 3A2A7E25BEA8AADB

View File

@ -4822,8 +4822,13 @@ void Client::handle_cap_flush_ack(MetaSession *session, Inode *in, Cap *cap, MCl
int cleaned = 0;
int flushed = 0;
for (map<ceph_tid_t, int>::iterator it = in->flushing_cap_tids.begin();
it != in->flushing_cap_tids.end(); ) {
auto it = in->flushing_cap_tids.begin();
if (it->first < flush_ack_tid) {
ldout(cct, 0) << __func__ << " mds." << session->mds_num
<< " got unexpected flush ack tid " << flush_ack_tid
<< " expected is " << it->first << dendl;
}
for (; it != in->flushing_cap_tids.end(); ) {
if (it->first == flush_ack_tid)
cleaned = it->second;
if (it->first <= flush_ack_tid) {