RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-01 08:32:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge PR #38363 into master

Browse Source 
* refs/pull/38363/head:
	mds/OpenFileTable: enhance the log info
	mds/OpenFileTable: add _read_omap_values() to simplify the code

Reviewed-by: Jos Collin <jcollin@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
This commit is contained in:
Patrick Donnelly 2020-12-16 20:13:09 -08:00
commit 02ea697d69
No known key found for this signature in database
GPG Key ID: 3A2A7E25BEA8AADB
2 changed files with 20 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/mds/OpenFileTable.cc
View File

@ -725,6 +725,22 @@ void OpenFileTable::_recover_finish(int r)
waiting_for_load.clear();
}
void OpenFileTable::_read_omap_values(const std::string& key, unsigned idx,
bool first)
{
object_t oid = get_object_name(idx);
dout(10) << __func__ << ": load from '" << oid << ":" << key << "'" << dendl;
object_locator_t oloc(mds->mdsmap->get_metadata_pool());
C_IO_OFT_Load *c = new C_IO_OFT_Load(this, idx, first);
ObjectOperation op;
if (first)
op.omap_get_header(&c->header_bl, &c->header_r);
op.omap_get_vals(key, "", uint64_t(-1),
&c->values, &c->more, &c->values_r);
mds->objecter->read(oid, oloc, op, CEPH_NOSNAP, nullptr, 0,
new C_OnFinisher(c, mds->finisher));
}
void OpenFileTable::_load_finish(int op_r, int header_r, int values_r,
unsigned idx, bool first, bool more,
bufferlist &header_bl,
@ -841,17 +857,8 @@ void OpenFileTable::_load_finish(int op_r, int header_r, int values_r,
last_key = values.rbegin()->first;
else
idx++;
dout(10) << __func__ << ": continue to load from '" << last_key << "'" << dendl;
object_t oid = get_object_name(idx);
object_locator_t oloc(mds->mdsmap->get_metadata_pool());
C_IO_OFT_Load *c = new C_IO_OFT_Load(this, idx, !more);
ObjectOperation op;
if (!more)
op.omap_get_header(&c->header_bl, &c->header_r);
op.omap_get_vals(last_key, "", uint64_t(-1),
&c->values, &c->more, &c->values_r);
mds->objecter->read(oid, oloc, op, CEPH_NOSNAP, nullptr, 0,
new C_OnFinisher(c, mds->finisher));
_read_omap_values(last_key, idx, !more);
return;
}
@ -962,17 +969,7 @@ void OpenFileTable::load(MDSContext *onload)
if (onload)
waiting_for_load.push_back(onload);
C_IO_OFT_Load *c = new C_IO_OFT_Load(this, 0, true);
object_t oid = get_object_name(0);
object_locator_t oloc(mds->mdsmap->get_metadata_pool());
ObjectOperation op;
op.omap_get_header(&c->header_bl, &c->header_r);
op.omap_get_vals("", "", uint64_t(-1),
&c->values, &c->more, &c->values_r);
mds->objecter->read(oid, oloc, op, CEPH_NOSNAP, nullptr, 0,
new C_OnFinisher(c, mds->finisher));
_read_omap_values("", 0, true);
}
void OpenFileTable::_get_ancestors(const Anchor& parent,

1
src/mds/OpenFileTable.h
View File

@ -93,6 +93,7 @@ protected:
loaded_journals.clear();
loaded_anchor_map.clear();
}
void _read_omap_values(const std::string& key, unsigned idx, bool first);
void _load_finish(int op_r, int header_r, int values_r,
unsigned idx, bool first, bool more,
bufferlist &header_bl,