fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-07-04 09:40:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Raft logic fixes

Browse Source
This commit is contained in:
Pavel Kirienko
2015-05-11 13:06:30 +03:00
parent 731d9f4574
commit 5af19f82c3
1 changed files with 9 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libuavcan/include/uavcan/protocol/dynamic_node_id_server/distributed/raft_core.hpp
+9 -19
View File
@@ -402,11 +402,10 @@ class RaftCore : private TimerBase
if (!cluster_.isKnownServer(request.getSrcNodeID()))
{
trace(TraceRaftRequestIgnored, request.getSrcNodeID().get());
response.setResponseEnabled(false);
return;
}
registerActivity();
UAVCAN_ASSERT(response.isResponseEnabled()); // This is default
/*
@@ -418,22 +417,16 @@ class RaftCore : private TimerBase
int res = persistent_state_.setCurrentTerm(request.term);
if (res < 0)
{
handlePersistentStateUpdateError(res);
response.setResponseEnabled(false);
trace(TraceRaftPersistStateUpdateError, res);
return;
}
res = persistent_state_.resetVotedFor();
if (res < 0)
{
handlePersistentStateUpdateError(res);
response.setResponseEnabled(false);
trace(TraceRaftPersistStateUpdateError, res);
}
switchState(ServerStateFollower);
setActiveMode(false);
if (!response.isResponseEnabled())
{
return;
}
}
@@ -454,6 +447,7 @@ class RaftCore : private TimerBase
return;
}
registerActivity();
switchState(ServerStateFollower);
setActiveMode(false);
@@ -565,6 +559,7 @@ class RaftCore : private TimerBase
if (!cluster_.isKnownServer(request.getSrcNodeID()))
{
trace(TraceRaftRequestIgnored, request.getSrcNodeID().get());
response.setResponseEnabled(false);
return;
}
@@ -581,21 +576,16 @@ class RaftCore : private TimerBase
int res = persistent_state_.setCurrentTerm(request.term);
if (res < 0)
{
handlePersistentStateUpdateError(res);
response.setResponseEnabled(false);
trace(TraceRaftPersistStateUpdateError, res);
return;
}
res = persistent_state_.resetVotedFor();
if (res < 0)
{
handlePersistentStateUpdateError(res);
response.setResponseEnabled(false);
trace(TraceRaftPersistStateUpdateError, res);
}
switchState(ServerStateFollower);
if (!response.isResponseEnabled())
{
return;
}
}