add metaserver test

eraft-io · Jul 1, 2023 · fa23186 · fa23186
1 parent 8af74ab
commit fa23186
Show file tree

Hide file tree

Showing 38 changed files with 476 additions and 68 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -246,6 +246,21 @@ target_link_libraries(eraftkv_server_test PUBLIC
  ${Protobuf_LIBRARY}
 )
 
+# build eraftmeta_server_tests
+add_executable(eraftmeta_server_test 
+ src/eraftmetaserver_test.cc 
+ src/eraftkv.pb.cc 
+ src/eraftkv.grpc.pb.cc
+ src/util.cc
+)
+target_link_libraries(eraftmeta_server_test PUBLIC
+ ${GTEST_LIBRARIES}
+ rocksdb
+ pthread
+ gRPC::grpc++
+ ${Protobuf_LIBRARY}
+)
+
 add_executable(rocksdb_storage_impl_tests 
  src/rocksdb_storage_impl_tests.cc 
  src/util.cc 

diff --git a/Dockerfile b/Dockerfile
@@ -46,7 +46,10 @@ FROM eraft/eraftkv:v0.0.4
 # && update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-10 20 \
 # && update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-10 20
 
-# RUN git clone https://github.com/grpc/grpc.git && cd grpc && git checkout v1.28.0 && git submodule update --init && mkdir .build && cd .build && cmake .. -DgRPC_BUILD_TESTS=OFF -DCMAKE_BUILD_TYPE=Release && make install -j4 && cd .. && rm -rf .build/CMakeCache.txt && cd .build && cmake .. -DgRPC_INSTALL=ON -DgRPC_BUILD_TESTS=OFF -DgRPC_PROTOBUF_PROVIDER=package -DgRPC_ZLIB_PROVIDER=package -DgRPC_CARES_PROVIDER=package -DgRPC_SSL_PROVIDER=package -DCMAKE_BUILD_TYPE=Release && make install -j4
+# RUN git clone https://github.com/grpc/grpc.git && cd grpc && git checkout v1.28.0 && git submodule update --init && \
+# mkdir .build && cd .build && cmake .. -DgRPC_BUILD_TESTS=OFF -DCMAKE_BUILD_TYPE=Release \
+# && make install -j4 && cd .. && rm -rf .build/CMakeCache.txt && cd .build && 
+# cmake .. -DgRPC_INSTALL=ON -DgRPC_BUILD_TESTS=OFF -DgRPC_PROTOBUF_PROVIDER=package -DgRPC_ZLIB_PROVIDER=package -DgRPC_CARES_PROVIDER=package -DgRPC_SSL_PROVIDER=package -DCMAKE_BUILD_TYPE=Release && make install -j4
 
 # intstall google benchmark
 # RUN git clone https://github.com/google/benchmark.git && git clone https://github.com/google/googletest.git benchmark/googletest && cd benchmark && cmake -E make_directory "build" && cmake -E chdir "build" cmake -DCMAKE_BUILD_TYPE=Release ../ && cmake --build "build" --config Release --target install

diff --git a/Makefile b/Makefile
@@ -52,10 +52,10 @@ rm-net:
 
 run-demo:
  docker run --name kvserver-node1 --network mytestnetwork --ip 172.18.0.2 -d --rm -v $(realpath .):/eraft eraft/eraftkv:v0.0.6 /eraft/build/eraftkv 0 /tmp/kv_db0 /tmp/log_db0 172.18.0.2:8088,172.18.0.3:8089,172.18.0.4:8090
- sleep 4s
+ sleep 5
  docker run --name kvserver-node2 --network mytestnetwork --ip 172.18.0.3 -d --rm -v $(realpath .):/eraft eraft/eraftkv:v0.0.6 /eraft/build/eraftkv 1 /tmp/kv_db1 /tmp/log_db1 172.18.0.2:8088,172.18.0.3:8089,172.18.0.4:8090
  docker run --name kvserver-node3 --network mytestnetwork --ip 172.18.0.4 -d --rm -v $(realpath .):/eraft eraft/eraftkv:v0.0.6 /eraft/build/eraftkv 2 /tmp/kv_db2 /tmp/log_db2 172.18.0.2:8088,172.18.0.3:8089,172.18.0.4:8090
- sleep 10s
+ sleep 10
  docker run --name vdbserver-node --network mytestnetwork --ip 172.18.0.6 -d --rm -v $(realpath .):/eraft eraft/eraftkv:v0.0.6 /eraft/build/eraft-vdb 172.18.0.6:12306 172.18.0.2:8088,172.18.0.3:8089,172.18.0.4:8090
 
 stop-demo:
@@ -67,3 +67,12 @@ run-demo-bench:
 run-vdb-tests:
  chmod +x utils/run-vdb-tests.sh
  docker run --name vdbserver-node-tests --network mytestnetwork --ip 172.18.0.8 -it --rm -v $(realpath .):/eraft eraft/eraftkv:v0.0.6 /eraft/utils/run-vdb-tests.sh
+
+run-metaserver-tests:
+ docker run --name metaserver-node1 --network mytestnetwork --ip 172.18.0.2 -d --rm -v $(realpath .):/eraft eraft/eraftkv:v0.0.6 /eraft/build/eraftmeta 0 /tmp/meta_db0 /tmp/log_db0 172.18.0.2:8088,172.18.0.3:8089,172.18.0.4:8090
+ docker run --name metaserver-node2 --network mytestnetwork --ip 172.18.0.3 -d --rm -v $(realpath .):/eraft eraft/eraftkv:v0.0.6 /eraft/build/eraftmeta 1 /tmp/meta_db1 /tmp/log_db1 172.18.0.2:8088,172.18.0.3:8089,172.18.0.4:8090
+ docker run --name metaserver-node3 --network mytestnetwork --ip 172.18.0.4 -d --rm -v $(realpath .):/eraft eraft/eraftkv:v0.0.6 /eraft/build/eraftmeta 2 /tmp/meta_db2 /tmp/log_db2 172.18.0.2:8088,172.18.0.3:8089,172.18.0.4:8090
+ sleep 10
+ docker run --name metaserver-tests --network mytestnetwork --ip 172.18.0.8 -it --rm -v $(realpath .):/eraft eraft/eraftkv:v0.0.6 /eraft/build/eraftmeta_server_test
+ sleep 2
+ docker stop metaserver-node1 metaserver-node2 metaserver-node3
diff --git a/protocol/eraftkv.proto b/protocol/eraftkv.proto
@@ -120,6 +120,7 @@ enum ChangeType {
  SlotMove = 4;
  ServerJoin = 5;
  ServerLeave = 6;
+ MetaMembersQuery = 7;
 }
 
 enum HandleServerType {
@@ -135,6 +136,7 @@ message ClusterConfigChangeReq {
  int64 config_version = 5;
  int64 op_count = 6;
  int64 command_id = 7;
+ ShardGroup shard_group = 8;
 }
 
 message ClusterConfigChangeResp {

diff --git a/src/async_buffer.cc b/src/async_buffer.cc
@@ -1,6 +1,6 @@
 /**
  * @file async_buffer.cc
- * @author ERaftGroup
+ * @author https://github.com/loveyacper/Qedis
  * @brief
  * @version 0.1
  * @date 2023-06-17

diff --git a/src/async_buffer.h b/src/async_buffer.h
@@ -1,6 +1,6 @@
 /**
  * @file async_buffer.h
- * @author ERaftGroup
+ * @author https://github.com/loveyacper/Qedis
  * @brief
  * @version 0.1
  * @date 2023-06-17

diff --git a/src/buffer.h b/src/buffer.h
@@ -1,6 +1,6 @@
 /**
  * @file buffer.h
- * @author ERaftGroup
+ * @author https://github.com/loveyacper/Qedis
  * @brief
  * @version 0.1
  * @date 2023-06-17

diff --git a/src/consts.h b/src/consts.h
@@ -0,0 +1,14 @@
+/**
+ * @file consts.h
+ * @author [email protected]
+ * @brief 
+ * @version 0.1
+ * @date 2023-07-01
+ * 
+ * @copyright Copyright (c) 2023
+ * 
+ */
+
+#pragma once
+
+#define SG_META_PREFIX "SG_META"
diff --git a/src/eraftkv.pb.cc b/src/eraftkv.pb.cc