resolve conflicts

cmake/braft.cmake

@@ -20,7 +20,8 @@ ExternalProject_Add(
         DEPENDS brpc
         # The pr on braft is not merged, so I am using my own warehouse to run the test for the time being
         GIT_REPOSITORY "https://github.com/pikiwidb/braft.git"
-        GIT_TAG v1.1.2.1
+        GIT_TAG v1.1.2-alpha2
+	URL_HASH SHA256=6afed189e97b7e6bf5864c5162fab3365b07d515fe0de4c1b0d61eff96cf772f
         GIT_SHALLOW true
         CMAKE_ARGS
         -DCMAKE_BUILD_TYPE=${LIB_BUILD_TYPE}

etc/script/save_load.sh

@@ -0,0 +1,23 @@
+#!/bin/bash
+
+killall -9 kiwi
+mkdir leader follower1
+
+
+PWD=`pwd`
+PROJECT_HOME="${PWD}/../"
+BIN="${PROJECT_HOME}/bin/kiwi"
+CONF="${PROJECT_HOME}/etc/conf/kiwi.conf"
+cd leader    && ulimit -n 99999  && rm -fr *  && ${BIN} ${CONF} --port 7777 &
+cd follower1 && ulimit -n 99999 && rm -fr *   && ${BIN} ${CONF} --port 8888 &
+sleep 5
+
+redis-cli -p 7777 raft.cluster init
+
+redis-benchmark -p 7777 -c 5 -n 10000 -r 10000 -d 1024 -t hset
+redis-cli -p 7777 raft.node dosnapshot
+redis-benchmark -p 7777 -c 5 -n 10000 -r 10000 -d 1024 -t hset
+redis-cli -p 7777 raft.node dosnapshot
+redis-benchmark -p 7777 -c 5 -n 10000 -r 10000 -d 1024 -t hset
+
+redis-cli -p 8888 raft.cluster join 127.0.0.1:7777