Merge pull request #11 from ThreeMammals/feature/writing-same-log-mul…

…tiple-times test fails intermitently because log written to more than once..work …
ThreeMammals · May 29, 2018 · 98e7d50 · 98e7d50
2 parents 585aad4 + 28f234f
commit 98e7d50
Show file tree

Hide file tree

Showing 61 changed files with 1,295 additions and 470 deletions.
diff --git a/Rafty.sln b/Rafty.sln
@@ -35,7 +35,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		version.ps1 = version.ps1
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Rafty.IntegrationTests", "test\Rafty.IntegrationTests\Rafty.IntegrationTests.csproj", "{BBB04228-BC0E-4711-9C80-769C5FAD777A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Rafty.IntegrationTests", "test\Rafty.IntegrationTests\Rafty.IntegrationTests.csproj", "{BBB04228-BC0E-4711-9C80-769C5FAD777A}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

diff --git a/src/Rafty/Concensus/Messages/AppendEntries.cs b/src/Rafty/Concensus/Messages/AppendEntries.cs
@@ -1,7 +1,8 @@
-namespace Rafty.Concensus
+namespace Rafty.Concensus.Messages
 {
     using System;
     using System.Collections.Generic;
+    using Infrastructure;
     using Log;
 
     public sealed class AppendEntries : Message

diff --git a/src/Rafty/Concensus/Messages/AppendEntriesBuilder.cs b/src/Rafty/Concensus/Messages/AppendEntriesBuilder.cs
@@ -1,6 +1,5 @@
-namespace Rafty.Concensus
+namespace Rafty.Concensus.Messages
 {
-    using System;
     using System.Collections.Generic;
     using Log;
 

diff --git a/src/Rafty/Concensus/Messages/AppendEntriesResponse.cs b/src/Rafty/Concensus/Messages/AppendEntriesResponse.cs
@@ -1,4 +1,4 @@
-namespace Rafty.Concensus
+namespace Rafty.Concensus.Messages
 {
     public sealed class AppendEntriesResponse
     {

diff --git a/src/Rafty/Concensus/Messages/AppendEntriesResponseBuilder.cs b/src/Rafty/Concensus/Messages/AppendEntriesResponseBuilder.cs
@@ -1,4 +1,4 @@
-namespace Rafty.Concensus
+namespace Rafty.Concensus.Messages
 {
     public class AppendEntriesResponseBuilder
     {

diff --git a/src/Rafty/Concensus/Messages/RequestVote.cs b/src/Rafty/Concensus/Messages/RequestVote.cs
@@ -1,6 +1,4 @@
-using System;
-
-namespace Rafty.Concensus
+namespace Rafty.Concensus.Messages
 {
     public sealed class RequestVote
     {

diff --git a/src/Rafty/Concensus/Messages/RequestVoteBuilder.cs b/src/Rafty/Concensus/Messages/RequestVoteBuilder.cs
@@ -1,6 +1,4 @@
-using System;
-
-namespace Rafty.Concensus
+namespace Rafty.Concensus.Messages
 {
     public class RequestVoteBuilder
     {

diff --git a/src/Rafty/Concensus/Messages/RequestVoteResponse.cs b/src/Rafty/Concensus/Messages/RequestVoteResponse.cs
@@ -1,4 +1,4 @@
-namespace Rafty.Concensus
+namespace Rafty.Concensus.Messages
 {
     public sealed class RequestVoteResponse
     {

diff --git a/src/Rafty/Concensus/Messages/RequestVoteResponseBuilder.cs b/src/Rafty/Concensus/Messages/RequestVoteResponseBuilder.cs
@@ -1,4 +1,4 @@
-namespace Rafty.Concensus
+namespace Rafty.Concensus.Messages
 {
     public class RequestVoteResponseBuilder
     {

diff --git a/src/Rafty/Concensus/Node/INode.cs b/src/Rafty/Concensus/Node/INode.cs
@@ -1,9 +1,10 @@
-using System;
-using Rafty.FiniteStateMachine;
-
-namespace Rafty.Concensus
+namespace Rafty.Concensus.Node
 {
     using System.Threading.Tasks;
+    using FiniteStateMachine;
+    using Infrastructure;
+    using Messages;
+    using States;
 
     public interface INode
     {
@@ -13,7 +14,7 @@ public interface INode
         void BecomeCandidate(CurrentState state);
         Task<AppendEntriesResponse> Handle(AppendEntries appendEntries);
         Task<RequestVoteResponse> Handle(RequestVote requestVote);
-        void Start(string id);
+        void Start(NodeId id);
         void Stop();
         Task<Response<T>> Accept<T>(T command) where T : ICommand;
     }

diff --git a/src/Rafty/Concensus/Node/Node.cs b/src/Rafty/Concensus/Node/Node.cs
@@ -1,14 +1,17 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Rafty.Concensus.States;
-using Rafty.FiniteStateMachine;
-using Rafty.Infrastructure;
-using Rafty.Log;
-
-namespace Rafty.Concensus
+namespace Rafty.Concensus.Node
 {
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading;
     using System.Threading.Tasks;
+    using FiniteStateMachine;
+    using Infrastructure;
+    using Log;
+    using Messages;
+    using Microsoft.Extensions.Logging;
+    using Peers;
+    using States;
 
     public class Node : INode
     { 
@@ -19,15 +22,21 @@ public class Node : INode
         private readonly ISettings _settings;
         private IRules _rules;
         private IPeersProvider _peersProvider;
+        private readonly ILoggerFactory _loggerFactory;
+        private readonly ILogger<Node> _logger;
+        private readonly SemaphoreSlim _appendingEntries = new SemaphoreSlim(1, 1);
+        private readonly SemaphoreSlim _requestVote = new SemaphoreSlim(1, 1);
+        private readonly SemaphoreSlim _acceptCommand = new SemaphoreSlim(1, 1);
 
         public Node(
-            IFiniteStateMachine fsm, 
-            ILog log, 
+            IFiniteStateMachine fsm,
+            ILog log,
             ISettings settings,
-            IPeersProvider peersProvider)
+            IPeersProvider peersProvider,
+            ILoggerFactory loggerFactory)
         {
-            //dont think rules should be injected at the moment..EEK UNCLE BOB
-            _rules = new Rules();
+            _loggerFactory = loggerFactory;
+            _logger = _loggerFactory.CreateLogger<Node>();
             _fsm = fsm;
             _log = log;
             _random = new RandomDelay();
@@ -42,54 +51,93 @@ public class Node : INode
 
         public IState State { get; private set; }
 
-        public void Start(string id)
+        public void Start(NodeId id)
         {
-            if(State?.CurrentState == null)
-            {
-                BecomeFollower(new CurrentState(id, 0, default(string), 0, 0, default(string)));
-            }
-            else
-            {
-                BecomeFollower(State.CurrentState);
-            }
+            _rules = new Rules(_loggerFactory, id);
+
+            BecomeFollower(State?.CurrentState ?? new CurrentState(id.Id, 0, default(string), 0, 0, default(string)));
         }
 
         public void BecomeCandidate(CurrentState state)
         {
-            State.Stop();
-            var candidate = new Candidate(state, _fsm, _getPeers(state), _log, _random, this, _settings, _rules);
+            State?.Stop();
+            _logger.LogInformation($"{state.Id} became candidate");
+            var candidate = new Candidate(state, _fsm, _getPeers(state), _log, _random, this, _settings, _rules, _loggerFactory);
             State = candidate;
             candidate.BeginElection();
         }
 
         public void BecomeLeader(CurrentState state)
         {
             State.Stop();
-            State = new Leader(state, _fsm, _getPeers, _log, this, _settings, _rules);
+            _logger.LogInformation($"{state.Id} became leader");
+            State = new Leader(state, _fsm, _getPeers, _log, this, _settings, _rules, _loggerFactory);
         }
 
         public void BecomeFollower(CurrentState state)
         {
             State?.Stop();
-            State = new Follower(state, _fsm, _log, _random, this, _settings, _rules, _getPeers(state));
+            _logger.LogInformation($"{state.Id} became follower");
+            State = new Follower(state, _fsm, _log, _random, this, _settings, _rules, _getPeers(state), _loggerFactory);
         }
 
         public async Task<AppendEntriesResponse> Handle(AppendEntries appendEntries)
         {
-            return await State.Handle(appendEntries);
+            try
+            {
+                await _appendingEntries.WaitAsync();
+
+                var response = await State.Handle(appendEntries);
+
+                if (appendEntries.Entries.Any())
+                {
+                    _logger.LogInformation($"{State.GetType().Name} id: {State.CurrentState.Id} responded to appendentries with success: {response.Success} and term: {response.Term}");
+                }
+
+                return response;
+            }
+            finally
+            {
+                _appendingEntries.Release();
+            }
         }
 
         public async Task<RequestVoteResponse> Handle(RequestVote requestVote)
         {
-            return await State.Handle(requestVote);
+            try
+            {
+                await _requestVote.WaitAsync();
+
+                return await State.Handle(requestVote);
+            }
+            finally
+            {
+                _requestVote.Release();
+            }
         }
 
         public async Task<Response<T>> Accept<T>(T command) where T : ICommand
         {
-            return await State.Accept(command);
+            try
+            {
+                await _acceptCommand.WaitAsync();
+
+                return await State.Accept(command);
+            }
+            finally
+            {
+                _acceptCommand.Release();
+
+            }
         }
 
         public void Stop()
+        {
+            State.Stop();
+            State = null;
+        }
+
+        public void Pause()
         {
             State.Stop();
         }

diff --git a/src/Rafty/Concensus/Node/NodePeer.cs b/src/Rafty/Concensus/Node/NodePeer.cs
@@ -1,11 +1,11 @@
-using System;
-using System.Net.Http;
-using Rafty.Concensus;
-using Rafty.FiniteStateMachine;
-
-namespace Rafty.AcceptanceTests
+namespace Rafty.Concensus.Node
 {
+    using System;
     using System.Threading.Tasks;
+    using FiniteStateMachine;
+    using Infrastructure;
+    using Messages;
+    using Peers;
 
     public class NodePeer : IPeer
     {

diff --git a/src/Rafty/Concensus/Peers/IPeer.cs b/src/Rafty/Concensus/Peers/IPeer.cs
@@ -1,9 +1,9 @@
-using System;
-using Rafty.FiniteStateMachine;
-
-namespace Rafty.Concensus
+namespace Rafty.Concensus.Peers
 {
     using System.Threading.Tasks;
+    using FiniteStateMachine;
+    using Infrastructure;
+    using Messages;
 
     public interface IPeer
     {

diff --git a/src/Rafty/Concensus/Peers/Peer.cs b/src/Rafty/Concensus/Peers/Peer.cs
@@ -1,9 +1,10 @@
-using Rafty.FiniteStateMachine;
-
-namespace Rafty.Concensus
+namespace Rafty.Concensus.Peers
 {
     using System;
     using System.Threading.Tasks;
+    using FiniteStateMachine;
+    using Infrastructure;
+    using Messages;
 
     public class Peer : IPeer
     {