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

fix: The delay inside the disabledMap was causing the storage server updateStorage actor to run on the client process

This commit is contained in:
Evan Tschannen 2019-06-13 14:28:30 -07:00
parent dccb9bc26d
commit 55f7e7d372
4 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
fdbrpc/sim2.actor.cpp
View File

@ -84,19 +84,6 @@ void ISimulator::displayWorkers() const
return;
}
void ISimulator::disableFor(const std::string& desc, double time) {
disabledMap[desc] = map(::delay(time), [this, desc](Void v){ disabledMap.erase(desc); return Void(); });
}
Future<Void> ISimulator::checkDisabled(const std::string& desc) const
{
auto iter = disabledMap.find(desc);
if (iter != disabledMap.end()) {
return iter->second;
}
return Void();
}
namespace std {
template<>
class hash<Endpoint> {

16
fdbrpc/simulator.h
View File

@ -311,8 +311,18 @@ public:
virtual flowGlobalType global(int id) { return getCurrentProcess()->global(id); };
virtual void setGlobal(size_t id, flowGlobalType v) { getCurrentProcess()->setGlobal(id,v); };
Future<Void> checkDisabled(const std::string& desc) const;
void disableFor(const std::string& desc, double time);
virtual void disableFor(const std::string& desc, double time) {
disabledMap[desc] = time;
}
virtual double checkDisabled(const std::string& desc) const
{
auto iter = disabledMap.find(desc);
if (iter != disabledMap.end()) {
return iter->second;
}
return 0;
}
static thread_local ProcessInfo* currentProcess;
protected:
@ -323,7 +333,7 @@ private:
std::map<NetworkAddress, int> excludedAddresses;
std::map<NetworkAddress, int> clearedAddresses;
std::map<NetworkAddress, std::map<std::string, int>> roleAddresses;
std::map<std::string, Future<Void>> disabledMap;
std::map<std::string, double> disabledMap;
bool allSwapsDisabled;
};

5
fdbserver/storageserver.actor.cpp
View File

@ -2863,7 +2863,10 @@ ACTOR Future<Void> updateStorage(StorageServer* data) {
loop {
ASSERT( data->durableVersion.get() == data->storageVersion() );
if (g_network->isSimulated()) {
wait(g_pSimulator->checkDisabled(format("%s/updateStorage", data->thisServerID.toString().c_str())));
double endTime = g_simulator.checkDisabled(format("%s/updateStorage", data->thisServerID.toString().c_str()));
if(endTime > now()) {
wait(delay(endTime - now(), TaskUpdateStorage));
}
}
wait( data->desiredOldestVersion.whenAtLeast( data->storageVersion()+1 ) );
wait( delay(0, TaskUpdateStorage) );

2
fdbserver/workloads/LocalRatekeeper.actor.cpp
View File

@ -115,7 +115,7 @@ struct LocalRatekeeperWorkload : TestWorkload {
ACTOR static Future<Void> _start(LocalRatekeeperWorkload* self, Database cx) {
wait(delay(self->startAfter));
state StorageServerInterface ssi = wait(getRandomStorage(cx));
g_simulator.disableFor(format("%s/updateStorage", ssi.id().toString().c_str()), self->blockWritesFor);
g_simulator.disableFor(format("%s/updateStorage", ssi.id().toString().c_str()), now() + self->blockWritesFor);
state Future<Void> done = delay(self->blockWritesFor);
// not much will happen until the storage goes over the soft limit
wait(delay(double(SERVER_KNOBS->STORAGE_DURABILITY_LAG_SOFT_MAX/1e6)));