shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-01-07 17:17:41 +03:00
Code Releases Wiki Activity

Sync fix for race condition on replica thread with master branch

Browse Source
This commit is contained in:
Ruben S. Montero 2019-02-25 10:42:41 +01:00
parent eb368386ab
commit e6daa66e39
2 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/raft/RaftManager.cc
View File

@ -601,7 +601,7 @@ void RaftManager::replicate_log(ReplicaRequest * request)
{ {
to_commit--; to_commit--;
} }
else if ( rindex == (int) it->second ) else
{ {
replica_manager.replicate(it->first); replica_manager.replicate(it->first);
} }

5
src/raft/ReplicaThread.cc
View File

@ -96,11 +96,6 @@ void ReplicaThread::do_replication()
if ( pthread_cond_timedwait(&cond, &mutex, &timeout) == ETIMEDOUT ) if ( pthread_cond_timedwait(&cond, &mutex, &timeout) == ETIMEDOUT )
{ {
if ( _prending_requests == true )
{
NebulaLog::log("RCM", Log::WARN, "Replication timeout with pending requests");
}
_pending_requests = retry_request || _pending_requests; _pending_requests = retry_request || _pending_requests;
} }