Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,5 @@
*~
libcraft.so
libcraft.a
cmake-make
build
6 changes: 6 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
[submodule "thirdparty/gtest"]
path = thirdparty/gtest
url = https://github.com/CPB9/gtest
[submodule "thirdparty/linked-list-queue"]
path = thirdparty/linked-list-queue
url = https://github.com/willemt/linked-list-queue.git
28 changes: 28 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
project(craft)

cmake_minimum_required(VERSION 2.8.11)

add_subdirectory(thirdparty/gtest)
target_compile_options(gtest PUBLIC -DGTEST_HAS_TR1_TUPLE=0)
target_compile_options(gtest_main PUBLIC -DGTEST_HAS_TR1_TUPLE=0)

add_library(craft STATIC
include/raft.h
include/raft_log.h
include/raft_private.h
src/raft_log.c
src/raft_node.c
src/raft_server.c
src/raft_server_properties.c
)
target_include_directories(craft PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include)

add_library(linked-list-queue STATIC
thirdparty/linked-list-queue/linked_list_queue.h
thirdparty/linked-list-queue/linked_list_queue.c
)
target_include_directories(linked-list-queue PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
set(LINKED_LIST_QUEUE_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/linked-list-queue)

set(GTEST_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/gtest/include)
add_subdirectory(tests)
4 changes: 3 additions & 1 deletion src/raft_server.c
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,7 @@ int raft_periodic(raft_server_t* me_, int msec_since_last_period)

/* Only one voting node means it's safe for us to become the leader */
if (1 == raft_get_num_voting_nodes(me_) &&
raft_get_my_node(me_) &&
raft_node_is_voting(raft_get_my_node((void*)me)) &&
!raft_is_leader(me_))
raft_become_leader(me_);
Expand All @@ -225,6 +226,7 @@ int raft_periodic(raft_server_t* me_, int msec_since_last_period)
!raft_snapshot_is_in_progress(me_))
{
if (1 < raft_get_num_voting_nodes(me_) &&
raft_get_my_node(me_) &&
raft_node_is_voting(raft_get_my_node(me_)))
{
int e = raft_election_start(me_);
Expand Down Expand Up @@ -833,7 +835,7 @@ int raft_send_appendentries(raft_server_t* me_, raft_node_t* node)
if (!(me->cb.send_appendentries))
return -1;

msg_appendentries_t ae = {};
msg_appendentries_t ae = {0};
ae.term = me->current_term;
ae.leader_commit = raft_get_commit_idx(me_);
ae.prev_log_idx = 0;
Expand Down
51 changes: 51 additions & 0 deletions tests/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
include_directories(
${RAFT_INCLUDE_DIRS}
SYSTEM
${GTEST_INCLUDE_DIRS}
${LINKED_LIST_QUEUE_INCLUDE_DIRS}
)

add_definitions(-DDATA_DIR="${CMAKE_CURRENT_SOURCE_DIR}/data")
set(TESTS_DIR ${CMAKE_BINARY_DIR}/bin/tests)
file(MAKE_DIRECTORY ${TESTS_DIR})

set(ALL_TESTS "")

macro(add_unit_test test file)
add_executable(${test} ${file} mock_send_functions.c)
target_link_libraries(${test}
${ARGN}
craft
linked-list-queue
gtest
gtest_main
)

set_target_properties(${test}
PROPERTIES
RUNTIME_OUTPUT_DIRECTORY ${TESTS_DIR}
FOLDER "tests"
)
add_test(${test} ${TESTS_DIR}/${test})
list(APPEND ALL_TESTS ${file})
endmacro()

add_unit_test(raft_log_tests test_log.cpp)
add_unit_test(raft_node_tests test_node.cpp)
add_unit_test(raft_scenario_tests test_scenario.cpp)
add_unit_test(raft_server_tests test_server.cpp)
add_unit_test(raft_snapshotting_tests test_snapshotting.cpp)

add_executable(all_tests EXCLUDE_FROM_ALL ${ALL_TESTS} mock_send_functions.c)
target_link_libraries(all_tests
craft
linked-list-queue
gtest
gtest_main
)

set_target_properties(all_tests
PROPERTIES
RUNTIME_OUTPUT_DIRECTORY ${TESTS_DIR}
FOLDER "tests"
)
Loading