Skip to content

Commit

Permalink
Attempt to fix #1065: AGAS cache isn't used/populated on worker local…
Browse files Browse the repository at this point in the history
…ities

Disable a check so that local ids are inserted into the caches.
  • Loading branch information
sithhell committed Feb 16, 2014
1 parent 7f57711 commit 48ffca7
Showing 1 changed file with 12 additions and 11 deletions.
23 changes: 12 additions & 11 deletions src/runtime/agas/addressing_service.cpp
Expand Up @@ -1105,7 +1105,7 @@ bool addressing_service::unbind_range_local(
// naming::id_type target(
// stubs::primary_namespace::get_service_instance(lower_id)
// , naming::id_type::unmanaged);
//
//
// rep = stubs::primary_namespace::service(
// target, req, threads::thread_priority_default, ec);
// }
Expand Down Expand Up @@ -1150,12 +1150,12 @@ bool addressing_service::unbind_range_local(
// )
// {
// // Resolve the address of the GID.
//
//
// // NOTE: We do not throw here for a reason; it is perfectly valid for the
// // GID to not be found in the local AGAS instance.
// if (!resolve(id, addr, ec) || ec)
// return false;
//
//
// return addr.locality_ == get_here();
// }

Expand Down Expand Up @@ -1200,10 +1200,10 @@ bool addressing_service::is_local_address_cached(
// if (all_resolved)
// return locals.any(); // all destinations resolved
// }
//
//
// if (!resolve_full(gids, addrs, size, locals, ec) || ec)
// return false;
//
//
// return locals.any();
// }

Expand Down Expand Up @@ -2188,12 +2188,13 @@ void addressing_service::update_cache_entry(
return;
}

if (naming::get_locality_id_from_gid(gid) ==
naming::get_locality_id_from_gid(locality_))
{
// we prefer not to store any local items in the AGAS cache
return;
}
// This causes the caches to stop being populated correctly. See #1065
//if (naming::get_locality_id_from_gid(gid) ==
// naming::get_locality_id_from_gid(locality_))
//{
// // we prefer not to store any local items in the AGAS cache
// return;
//}

try {
// The entry in AGAS for a locality's RTS component has a count of 0,
Expand Down

0 comments on commit 48ffca7

Please sign in to comment.