wbtiger
/
foundationdb
mirror of https://github.com/apple/foundationdb.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

addressMap[normalizedAddress]->address may not equal to normalizedAddress

This commit is contained in:
Meng Xu 2020-03-12 13:01:25 -07:00
parent 1759d5c8c4
commit 0ef09539a9
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fdbrpc/sim2.actor.cpp
View File

@ -1584,7 +1584,9 @@ public:
virtual ProcessInfo* getProcessByAddress( NetworkAddress const& address ) {
NetworkAddress normalizedAddress(address.ip, address.port, true, address.isTLS());
ASSERT( addressMap.count( normalizedAddress ) );
return addressMap[ normalizedAddress ];
// NOTE: addressMap[normalizedAddress]->address may not equal to normalizedAddress
// ASSERT_WE_THINK( addressMap[normalizedAddress]->address == normalizedAddress );
return addressMap[normalizedAddress];
}
virtual MachineInfo* getMachineByNetworkAddress(NetworkAddress const& address) {

3
fdbserver/workloads/ConsistencyCheck.actor.cpp
View File

@ -1350,7 +1350,8 @@ struct ConsistencyCheckWorkload : TestWorkload
TraceEvent("ConsistencyCheck_RebootProcess")
.detail("Address",
itr->interf.address()) // worker's primary address (i.e., the first address)
.detail("ProcessAddress", p->address)
.detail("ProcessPrimaryAddress", p->address)
.detail("ProcessAddresses", p->addresses.toString())
.detail("DataStoreID", id)
.detail("Protected", g_simulator.protectedAddresses.count(itr->interf.address()))
.detail("Reliable", p->isReliable())