On Thu, 23 May 2013, Yan, Zheng wrote:
> From: "Yan, Zheng" <zheng.z.yan@xxxxxxxxx>
>
> CInode:mds_caps_wanted is used to keep track of caps wanted by non-auth
> MDS. The auth MDS checks it when choosing locks' states.
>
> Signed-off-by: Yan, Zheng <zheng.z.yan@xxxxxxxxx>
> ---
> src/mds/Migrator.cc | 7 ++++---
> 1 file changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/src/mds/Migrator.cc b/src/mds/Migrator.cc
> index 5cc26a3..766ecf9 100644
> --- a/src/mds/Migrator.cc
> +++ b/src/mds/Migrator.cc
> @@ -1025,6 +1025,7 @@ void Migrator::encode_export_inode_caps(CInode *in, bufferlist& bl,
> map<client_t,Capability::Export> cap_map;
> in->export_client_caps(cap_map);
> ::encode(cap_map, bl);
> + ::encode(in->get_mds_caps_wanted(), bl);
Since this goes over the wire the type needs to be changed to sized
integer types, not the current map<int,int>... I'd say
map<int32_t,int32_t> in this case.
>
> in->state_set(CInode::STATE_EXPORTINGCAPS);
> in->get(CInode::PIN_EXPORTINGCAPS);
> @@ -2379,7 +2380,8 @@ void Migrator::decode_import_inode_caps(CInode *in,
> {
> map<client_t,Capability::Export> cap_map;
> ::decode(cap_map, blp);
> - if (!cap_map.empty()) {
> + ::decode(in->get_mds_caps_wanted(), blp);
> + if (!cap_map.empty() || !in->get_mds_caps_wanted().empty()) {
> cap_imports[in].swap(cap_map);
> in->get(CInode::PIN_IMPORTINGCAPS);
> }
> @@ -2388,8 +2390,6 @@ void Migrator::decode_import_inode_caps(CInode *in,
> void Migrator::finish_import_inode_caps(CInode *in, int from,
> map<client_t,Capability::Export> &cap_map)
> {
> - assert(!cap_map.empty());
> -
> for (map<client_t,Capability::Export>::iterator it = cap_map.begin();
> it != cap_map.end();
> ++it) {
> @@ -2406,6 +2406,7 @@ void Migrator::finish_import_inode_caps(CInode *in, int from,
> mds->mdcache->do_cap_import(session, in, cap);
> }
>
> + in->replica_caps_wanted = 0;
> in->put(CInode::PIN_IMPORTINGCAPS);
> }
>
> --
> 1.8.1.4
>
>
--
To unsubscribe from this list: send the line "unsubscribe ceph-devel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
