Skip to content

improvements to raft and bug fixes #87

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
krgn wants to merge 27 commits into
base: master
Choose a base branch
from
Open

improvements to raft and bug fixes #87

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
fa9cd83
adding separate ClusterMember type for project file
krgn Jan 9, 2018
b391981
minor refactorings in raft
krgn Jan 10, 2018
3a311b6
remove unused buffer manager in tcp server
krgn Jan 25, 2018
9c7da16
deduplicating RaftMember and ClusterMember types
krgn Jan 30, 2018
f68dfb1
use optics in Project module
krgn Jan 31, 2018
f7de097
refactoring Raft modules
krgn Feb 6, 2018
441cd04
refactor Raft.fs into better separated modules
krgn Feb 7, 2018
dac09bc
more work separating effectful from pure Raft code
krgn Feb 8, 2018
5ba394f
groom Raft module even more
krgn Feb 8, 2018
9ca41e6
index N -> N<index>
krgn Feb 8, 2018
64e147a
term N -> N<term>
krgn Feb 9, 2018
07a58da
fix some bugs
krgn Feb 9, 2018
21ca67c
fix peer counting by always using Map.count
krgn Feb 9, 2018
84d3992
fix frontend
krgn Feb 9, 2018
14dbb5a
remove custom Either type in favor of built-in Result
krgn Feb 9, 2018
ab4e26b
refactor and simplify raft code
krgn Feb 13, 2018
d131012
make logging fields configurable
krgn Feb 13, 2018
5dbbc28
do send snapshot to followers after successful reconfiguration
krgn Feb 14, 2018
dbca4d6
make State.update total by removing wildcard
krgn Feb 16, 2018
23130cb
remove Member and State fields from RaftState
krgn Feb 20, 2018
43af9da
ensure cluster config and states are correct after cluster changes
krgn Feb 20, 2018
3cdb59e
add another wait to circumvent cases that cause test to fail
krgn Feb 22, 2018
130528d
rename test for clarity
krgn Feb 22, 2018
01560d9
add missing field to logging initialization code
krgn Feb 23, 2018
709f182
update Paket
krgn Feb 26, 2018
96b17fb
fix client build
krgn Feb 26, 2018
1fd031d
increase timeout value in test
krgn Feb 26, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions .paket/Paket.Restore.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@
<_PaketExeExtension>$([System.IO.Path]::GetExtension("$(PaketExePath)"))</_PaketExeExtension>
<PaketCommand Condition=" '$(_PaketExeExtension)' == '.dll' ">dotnet "$(PaketExePath)"</PaketCommand>

<!-- no extension is a shell script -->
<PaketCommand Condition=" '$(_PaketExeExtension)' == '' ">"$(PaketExePath)"</PaketCommand>

<PaketBootStrapperExePath Condition=" '$(PaketBootStrapperExePath)' == '' AND Exists('$(PaketRootPath)paket.bootstrapper.exe')">$(PaketRootPath)paket.bootstrapper.exe</PaketBootStrapperExePath>
<PaketBootStrapperExePath Condition=" '$(PaketBootStrapperExePath)' == '' ">$(PaketToolsPath)paket.bootstrapper.exe</PaketBootStrapperExePath>
<PaketBootStrapperCommand Condition=" '$(OS)' == 'Windows_NT'">"$(PaketBootStrapperExePath)"</PaketBootStrapperCommand>
Expand Down Expand Up @@ -50,10 +53,10 @@
</PropertyGroup>

<!-- If shasum and awk exist get the hashes -->
<Exec Condition=" '$(PaketRestoreCachedHasher)' != '' " Command="$(PaketRestoreCachedHasher)" ConsoleToMSBuild='true'>
<Exec StandardOutputImportance="Low" Condition=" '$(PaketRestoreCachedHasher)' != '' " Command="$(PaketRestoreCachedHasher)" ConsoleToMSBuild='true'>
<Output TaskParameter="ConsoleOutput" PropertyName="PaketRestoreCachedHash" />
</Exec>
<Exec Condition=" '$(PaketRestoreLockFileHasher)' != '' " Command="$(PaketRestoreLockFileHasher)" ConsoleToMSBuild='true'>
<Exec StandardOutputImportance="Low" Condition=" '$(PaketRestoreLockFileHasher)' != '' " Command="$(PaketRestoreLockFileHasher)" ConsoleToMSBuild='true'>
<Output TaskParameter="ConsoleOutput" PropertyName="PaketRestoreLockFileHash" />
</Exec>

Expand Down Expand Up @@ -145,9 +148,10 @@
</DotNetCliToolReference>
</ItemGroup>

<!-- Disabled for now until we know what to do with runtime deps - https://github.com/fsprojects/Paket/issues/2964
<PropertyGroup>
<RestoreConfigFile>$(MSBuildProjectDirectory)/obj/$(MSBuildProjectFile).NuGet.Config</RestoreConfigFile>
</PropertyGroup>
</PropertyGroup> -->

</Target>

Expand Down
Binary file modified .paket/paket.exe
View file
Open in desktop
Binary file not shown.
20 changes: 10 additions & 10 deletions src/Disco/Disco/Client/ApiClient.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,28 +189,28 @@ module ApiClient =

let private handleServerRequest (state: ClientState) (req: Request) (agent: ApiAgent) =
match req.Body |> Binary.decode with
| Right (ApiRequest.Snapshot snapshot) ->
| Ok (ApiRequest.Snapshot snapshot) ->
state.Socket.Status
|> String.format "received snapshot (status: {0})"
|> Logger.info (tag "handleServerResponse")
snapshot
|> Msg.SetState
|> agent.Post

| Right (ApiRequest.Update sm) ->
| Ok (ApiRequest.Update sm) ->
sm
|> Msg.Update
|> agent.Post

| Right other ->
| Ok other ->
string other
|> ApiError.UnknownCommand
|> ApiResponse.NOK
|> Binary.encode
|> Response.fromRequest req
|> state.Socket.Respond

| Left error ->
| Error error ->
error
|> string
|> ApiError.MalformedRequest
Expand All @@ -230,7 +230,7 @@ module ApiClient =
// | _ < __/ (_| | \__ \ || __/ | | __/ (_| |
// |_| \_\___|\__, |_|___/\__\___|_| \___|\__,_|
// |___/
| Right ApiResponse.Registered ->
| Ok ApiResponse.Registered ->
Logger.info (tag "handleClientResponse") "registration successful"
ClientEvent.Registered |> Msg.Notify |> agent.Post

Expand All @@ -240,7 +240,7 @@ module ApiClient =
// | |_| | | | | _ < __/ (_| | \__ \ || __/ | | __/ (_| |
// \___/|_| |_|_| \_\___|\__, |_|___/\__\___|_| \___|\__,_|
// |___/
| Right ApiResponse.Unregistered ->
| Ok ApiResponse.Unregistered ->
Logger.info (tag "handleClientResponse") "un-registration successful"
ClientEvent.UnRegistered |> Msg.Notify |> agent.Post
agent.Post Msg.Dispose
Expand All @@ -250,14 +250,14 @@ module ApiClient =
// | \| | | | | ' /
// | |\ | |_| | . \
// |_| \_|\___/|_|\_\
| Right (ApiResponse.NOK error) -> error |> string |> Logger.err (tag "handleClientResponse")
| Ok (ApiResponse.NOK error) -> error |> string |> Logger.err (tag "handleClientResponse")

// ____ _ _____
// | _ \ ___ ___ ___ __| | ___ | ____|_ __ _ __ ___ _ __
// | | | |/ _ \/ __/ _ \ / _` |/ _ \ | _| | '__| '__/ _ \| '__|
// | |_| | __/ (_| (_) | (_| | __/ | |___| | | | | (_) | |
// |____/ \___|\___\___/ \__,_|\___| |_____|_| |_| \___/|_|
| Left error -> error |> string |> Logger.err (tag "handleClientResponse")
| Error error -> error |> string |> Logger.err (tag "handleClientResponse")
state

// ** handleSocketEvent
Expand Down Expand Up @@ -376,7 +376,7 @@ module ApiClient =
// **** Start

member self.Start () =
either {
result {
server.Port
|> sprintf "Connecting to server on %O:%O" server.IpAddress
|> Logger.info (tag "start")
Expand All @@ -387,7 +387,7 @@ module ApiClient =
// **** Restart

member self.Restart(server: DiscoServer) =
server |> Msg.Restart |> agent.Post |> Either.succeed
server |> Msg.Restart |> agent.Post |> Result.succeed

// **** State

Expand Down
Loading