sync refactor
This commit is contained in:
Minghao Li
parent
3b4149ba32
commit
d3b1d5d8f1
|
|
@ -0,0 +1,49 @@
|
||||||
|
/*
|
||||||
|
* Copyright (c) 2019 TAOS Data, Inc. <jhtao@taosdata.com>
|
||||||
|
*
|
||||||
|
* This program is free software: you can use, redistribute, and/or modify
|
||||||
|
* it under the terms of the GNU Affero General Public License, version 3
|
||||||
|
* or later ("AGPL"), as published by the Free Software Foundation.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful, but WITHOUT
|
||||||
|
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||||
|
* FITNESS FOR A PARTICULAR PURPOSE.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU Affero General Public License
|
||||||
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef _TD_LIBS_SYNC_INDEX_MGR_H
|
||||||
|
#define _TD_LIBS_SYNC_INDEX_MGR_H
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
extern "C" {
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#include <stdint.h>
|
||||||
|
#include <stdio.h>
|
||||||
|
#include <stdlib.h>
|
||||||
|
#include "syncInt.h"
|
||||||
|
#include "taosdef.h"
|
||||||
|
|
||||||
|
// SIndexMgr -----------------------------
|
||||||
|
typedef struct SSyncIndexMgr {
|
||||||
|
SRaftId (*replicas)[TSDB_MAX_REPLICA];
|
||||||
|
SyncIndex index[TSDB_MAX_REPLICA];
|
||||||
|
int32_t replicaNum;
|
||||||
|
SSyncNode *pSyncNode;
|
||||||
|
} SSyncIndexMgr;
|
||||||
|
|
||||||
|
SSyncIndexMgr *syncIndexMgrCreate(SSyncNode *pSyncNode);
|
||||||
|
void syncIndexMgrDestroy(SSyncIndexMgr *pSyncIndexMgr);
|
||||||
|
void syncIndexMgrClear(SSyncIndexMgr *pSyncIndexMgr);
|
||||||
|
void syncIndexMgrSetIndex(SSyncIndexMgr *pSyncIndexMgr, const SRaftId *pRaftId, SyncIndex index);
|
||||||
|
SyncIndex syncIndexMgrGetIndex(SSyncIndexMgr *pSyncIndexMgr, const SRaftId *pRaftId);
|
||||||
|
cJSON * syncIndexMgr2Json(SSyncIndexMgr *pSyncIndexMgr);
|
||||||
|
char * syncIndexMgr2Str(SSyncIndexMgr *pSyncIndexMgr);
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#endif /*_TD_LIBS_SYNC_INDEX_MGR_H*/
|
||||||
|
|
@ -0,0 +1,99 @@
|
||||||
|
/*
|
||||||
|
* Copyright (c) 2019 TAOS Data, Inc. <jhtao@taosdata.com>
|
||||||
|
*
|
||||||
|
* This program is free software: you can use, redistribute, and/or modify
|
||||||
|
* it under the terms of the GNU Affero General Public License, version 3
|
||||||
|
* or later ("AGPL"), as published by the Free Software Foundation.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful, but WITHOUT
|
||||||
|
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||||
|
* FITNESS FOR A PARTICULAR PURPOSE.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU Affero General Public License
|
||||||
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "syncIndexMgr.h"
|
||||||
|
#include "syncUtil.h"
|
||||||
|
|
||||||
|
// SMatchIndex -----------------------------
|
||||||
|
|
||||||
|
SSyncIndexMgr *syncIndexMgrCreate(SSyncNode *pSyncNode) {
|
||||||
|
SSyncIndexMgr *pSyncIndexMgr = malloc(sizeof(SSyncIndexMgr));
|
||||||
|
assert(pSyncIndexMgr != NULL);
|
||||||
|
memset(pSyncIndexMgr, 0, sizeof(SSyncIndexMgr));
|
||||||
|
|
||||||
|
pSyncIndexMgr->replicas = &(pSyncNode->replicasId);
|
||||||
|
pSyncIndexMgr->replicaNum = pSyncNode->replicaNum;
|
||||||
|
pSyncIndexMgr->pSyncNode = pSyncNode;
|
||||||
|
syncIndexMgrClear(pSyncIndexMgr);
|
||||||
|
|
||||||
|
return pSyncIndexMgr;
|
||||||
|
}
|
||||||
|
|
||||||
|
void syncIndexMgrDestroy(SSyncIndexMgr *pSyncIndexMgr) {
|
||||||
|
if (pSyncIndexMgr != NULL) {
|
||||||
|
free(pSyncIndexMgr);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void syncIndexMgrClear(SSyncIndexMgr *pSyncIndexMgr) {
|
||||||
|
memset(pSyncIndexMgr->index, 0, sizeof(pSyncIndexMgr->index));
|
||||||
|
/*
|
||||||
|
for (int i = 0; i < pSyncIndexMgr->replicaNum; ++i) {
|
||||||
|
pSyncIndexMgr->index[i] = 0;
|
||||||
|
}
|
||||||
|
*/
|
||||||
|
}
|
||||||
|
|
||||||
|
void syncIndexMgrSetIndex(SSyncIndexMgr *pSyncIndexMgr, const SRaftId *pRaftId, SyncIndex index) {
|
||||||
|
for (int i = 0; i < pSyncIndexMgr->replicaNum; ++i) {
|
||||||
|
if (syncUtilSameId(&((*(pSyncIndexMgr->replicas))[i]), pRaftId)) {
|
||||||
|
(pSyncIndexMgr->index)[i] = index;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
assert(0);
|
||||||
|
}
|
||||||
|
|
||||||
|
SyncIndex syncIndexMgrGetIndex(SSyncIndexMgr *pSyncIndexMgr, const SRaftId *pRaftId) {
|
||||||
|
for (int i = 0; i < pSyncIndexMgr->replicaNum; ++i) {
|
||||||
|
if (syncUtilSameId(&((*(pSyncIndexMgr->replicas))[i]), pRaftId)) {
|
||||||
|
SyncIndex idx = (pSyncIndexMgr->index)[i];
|
||||||
|
return idx;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
assert(0);
|
||||||
|
}
|
||||||
|
|
||||||
|
cJSON *syncIndexMgr2Json(SSyncIndexMgr *pSyncIndexMgr) {
|
||||||
|
char u64buf[128];
|
||||||
|
cJSON *pRoot = cJSON_CreateObject();
|
||||||
|
|
||||||
|
cJSON_AddNumberToObject(pRoot, "replicaNum", pSyncIndexMgr->replicaNum);
|
||||||
|
cJSON *pReplicas = cJSON_CreateArray();
|
||||||
|
cJSON_AddItemToObject(pRoot, "replicas", pReplicas);
|
||||||
|
for (int i = 0; i < pSyncIndexMgr->replicaNum; ++i) {
|
||||||
|
cJSON_AddItemToArray(pReplicas, syncUtilRaftId2Json(&(*(pSyncIndexMgr->replicas))[i]));
|
||||||
|
}
|
||||||
|
int respondNum = 0;
|
||||||
|
int *arr = (int *)malloc(sizeof(int) * pSyncIndexMgr->replicaNum);
|
||||||
|
for (int i = 0; i < pSyncIndexMgr->replicaNum; ++i) {
|
||||||
|
arr[i] = pSyncIndexMgr->index[i];
|
||||||
|
}
|
||||||
|
cJSON *pIsRespond = cJSON_CreateIntArray(arr, pSyncIndexMgr->replicaNum);
|
||||||
|
free(arr);
|
||||||
|
snprintf(u64buf, sizeof(u64buf), "%p", pSyncIndexMgr->pSyncNode);
|
||||||
|
cJSON_AddStringToObject(pRoot, "pSyncNode", u64buf);
|
||||||
|
|
||||||
|
cJSON *pJson = cJSON_CreateObject();
|
||||||
|
cJSON_AddItemToObject(pJson, "pSyncIndexMgr", pRoot);
|
||||||
|
return pJson;
|
||||||
|
}
|
||||||
|
|
||||||
|
char *syncIndexMgr2Str(SSyncIndexMgr *pSyncIndexMgr) {
|
||||||
|
cJSON *pJson = syncIndexMgr2Json(pSyncIndexMgr);
|
||||||
|
char *serialized = cJSON_Print(pJson);
|
||||||
|
cJSON_Delete(pJson);
|
||||||
|
return serialized;
|
||||||
|
}
|
||||||
|
|
@ -14,6 +14,7 @@ add_executable(syncInitTest "")
|
||||||
add_executable(syncUtilTest "")
|
add_executable(syncUtilTest "")
|
||||||
add_executable(syncVotesGrantedTest "")
|
add_executable(syncVotesGrantedTest "")
|
||||||
add_executable(syncVotesRespondTest "")
|
add_executable(syncVotesRespondTest "")
|
||||||
|
add_executable(syncIndexMgrTest "")
|
||||||
|
|
||||||
|
|
||||||
target_sources(syncTest
|
target_sources(syncTest
|
||||||
|
|
@ -80,6 +81,10 @@ target_sources(syncVotesRespondTest
|
||||||
PRIVATE
|
PRIVATE
|
||||||
"syncVotesRespondTest.cpp"
|
"syncVotesRespondTest.cpp"
|
||||||
)
|
)
|
||||||
|
target_sources(syncIndexMgrTest
|
||||||
|
PRIVATE
|
||||||
|
"syncIndexMgrTest.cpp"
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
target_include_directories(syncTest
|
target_include_directories(syncTest
|
||||||
|
|
@ -162,6 +167,11 @@ target_include_directories(syncVotesRespondTest
|
||||||
"${CMAKE_SOURCE_DIR}/include/libs/sync"
|
"${CMAKE_SOURCE_DIR}/include/libs/sync"
|
||||||
"${CMAKE_CURRENT_SOURCE_DIR}/../inc"
|
"${CMAKE_CURRENT_SOURCE_DIR}/../inc"
|
||||||
)
|
)
|
||||||
|
target_include_directories(syncIndexMgrTest
|
||||||
|
PUBLIC
|
||||||
|
"${CMAKE_SOURCE_DIR}/include/libs/sync"
|
||||||
|
"${CMAKE_CURRENT_SOURCE_DIR}/../inc"
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
target_link_libraries(syncTest
|
target_link_libraries(syncTest
|
||||||
|
|
@ -228,6 +238,10 @@ target_link_libraries(syncVotesRespondTest
|
||||||
sync
|
sync
|
||||||
gtest_main
|
gtest_main
|
||||||
)
|
)
|
||||||
|
target_link_libraries(syncIndexMgrTest
|
||||||
|
sync
|
||||||
|
gtest_main
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
enable_testing()
|
enable_testing()
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,156 @@
|
||||||
|
#include <gtest/gtest.h>
|
||||||
|
#include <stdio.h>
|
||||||
|
#include "syncEnv.h"
|
||||||
|
#include "syncIO.h"
|
||||||
|
#include "syncInt.h"
|
||||||
|
#include "syncRaftStore.h"
|
||||||
|
#include "syncUtil.h"
|
||||||
|
#include "syncVoteMgr.h"
|
||||||
|
|
||||||
|
void logTest() {
|
||||||
|
sTrace("--- sync log test: trace");
|
||||||
|
sDebug("--- sync log test: debug");
|
||||||
|
sInfo("--- sync log test: info");
|
||||||
|
sWarn("--- sync log test: warn");
|
||||||
|
sError("--- sync log test: error");
|
||||||
|
sFatal("--- sync log test: fatal");
|
||||||
|
}
|
||||||
|
|
||||||
|
uint16_t ports[] = {7010, 7110, 7210, 7310, 7410};
|
||||||
|
int32_t replicaNum = 3;
|
||||||
|
int32_t myIndex = 0;
|
||||||
|
|
||||||
|
SRaftId ids[TSDB_MAX_REPLICA];
|
||||||
|
SSyncInfo syncInfo;
|
||||||
|
SSyncFSM* pFsm;
|
||||||
|
SSyncNode* pSyncNode;
|
||||||
|
|
||||||
|
SSyncNode* syncNodeInit() {
|
||||||
|
syncInfo.vgId = 1234;
|
||||||
|
syncInfo.rpcClient = gSyncIO->clientRpc;
|
||||||
|
syncInfo.FpSendMsg = syncIOSendMsg;
|
||||||
|
syncInfo.queue = gSyncIO->pMsgQ;
|
||||||
|
syncInfo.FpEqMsg = syncIOEqMsg;
|
||||||
|
syncInfo.pFsm = pFsm;
|
||||||
|
snprintf(syncInfo.path, sizeof(syncInfo.path), "%s", "./test_path");
|
||||||
|
snprintf(syncInfo.walPath, sizeof(syncInfo.walPath), "%s", "./test_wal_path");
|
||||||
|
|
||||||
|
SSyncCfg* pCfg = &syncInfo.syncCfg;
|
||||||
|
pCfg->myIndex = myIndex;
|
||||||
|
pCfg->replicaNum = replicaNum;
|
||||||
|
|
||||||
|
for (int i = 0; i < replicaNum; ++i) {
|
||||||
|
pCfg->nodeInfo[i].nodePort = ports[i];
|
||||||
|
snprintf(pCfg->nodeInfo[i].nodeFqdn, sizeof(pCfg->nodeInfo[i].nodeFqdn), "%s", "127.0.0.1");
|
||||||
|
// taosGetFqdn(pCfg->nodeInfo[0].nodeFqdn);
|
||||||
|
}
|
||||||
|
|
||||||
|
pSyncNode = syncNodeOpen(&syncInfo);
|
||||||
|
assert(pSyncNode != NULL);
|
||||||
|
|
||||||
|
gSyncIO->FpOnSyncPing = pSyncNode->FpOnPing;
|
||||||
|
gSyncIO->FpOnSyncPingReply = pSyncNode->FpOnPingReply;
|
||||||
|
gSyncIO->FpOnSyncRequestVote = pSyncNode->FpOnRequestVote;
|
||||||
|
gSyncIO->FpOnSyncRequestVoteReply = pSyncNode->FpOnRequestVoteReply;
|
||||||
|
gSyncIO->FpOnSyncAppendEntries = pSyncNode->FpOnAppendEntries;
|
||||||
|
gSyncIO->FpOnSyncAppendEntriesReply = pSyncNode->FpOnAppendEntriesReply;
|
||||||
|
gSyncIO->FpOnSyncPing = pSyncNode->FpOnPing;
|
||||||
|
gSyncIO->FpOnSyncPingReply = pSyncNode->FpOnPingReply;
|
||||||
|
gSyncIO->pSyncNode = pSyncNode;
|
||||||
|
|
||||||
|
return pSyncNode;
|
||||||
|
}
|
||||||
|
|
||||||
|
SSyncNode* syncInitTest() { return syncNodeInit(); }
|
||||||
|
|
||||||
|
void initRaftId(SSyncNode* pSyncNode) {
|
||||||
|
for (int i = 0; i < replicaNum; ++i) {
|
||||||
|
ids[i] = pSyncNode->replicasId[i];
|
||||||
|
char* s = syncUtilRaftId2Str(&ids[i]);
|
||||||
|
printf("raftId[%d] : %s\n", i, s);
|
||||||
|
free(s);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
int main(int argc, char** argv) {
|
||||||
|
// taosInitLog((char *)"syncTest.log", 100000, 10);
|
||||||
|
tsAsyncLog = 0;
|
||||||
|
sDebugFlag = 143 + 64;
|
||||||
|
|
||||||
|
myIndex = 0;
|
||||||
|
if (argc >= 2) {
|
||||||
|
myIndex = atoi(argv[1]);
|
||||||
|
}
|
||||||
|
|
||||||
|
int32_t ret = syncIOStart((char*)"127.0.0.1", ports[myIndex]);
|
||||||
|
assert(ret == 0);
|
||||||
|
|
||||||
|
ret = syncEnvStart();
|
||||||
|
assert(ret == 0);
|
||||||
|
|
||||||
|
SSyncNode* pSyncNode = syncInitTest();
|
||||||
|
assert(pSyncNode != NULL);
|
||||||
|
|
||||||
|
char* serialized = syncNode2Str(pSyncNode);
|
||||||
|
printf("%s\n", serialized);
|
||||||
|
free(serialized);
|
||||||
|
|
||||||
|
initRaftId(pSyncNode);
|
||||||
|
|
||||||
|
SVotesGranted* pVotesGranted = voteGrantedCreate(pSyncNode);
|
||||||
|
assert(pVotesGranted != NULL);
|
||||||
|
|
||||||
|
printf("---------------------------------------\n");
|
||||||
|
{
|
||||||
|
char* serialized = voteGranted2Str(pVotesGranted);
|
||||||
|
assert(serialized != NULL);
|
||||||
|
printf("%s\n", serialized);
|
||||||
|
free(serialized);
|
||||||
|
}
|
||||||
|
|
||||||
|
SyncTerm term = 1234;
|
||||||
|
printf("---------------------------------------\n");
|
||||||
|
voteGrantedReset(pVotesGranted, term);
|
||||||
|
{
|
||||||
|
char* serialized = voteGranted2Str(pVotesGranted);
|
||||||
|
assert(serialized != NULL);
|
||||||
|
printf("%s\n", serialized);
|
||||||
|
free(serialized);
|
||||||
|
}
|
||||||
|
|
||||||
|
for (int i = 0; i < replicaNum; ++i) {
|
||||||
|
SyncRequestVoteReply* reply = SyncRequestVoteReplyBuild();
|
||||||
|
reply->destId = pSyncNode->myRaftId;
|
||||||
|
reply->srcId = ids[i];
|
||||||
|
reply->term = term;
|
||||||
|
reply->voteGranted = true;
|
||||||
|
|
||||||
|
voteGrantedVote(pVotesGranted, reply);
|
||||||
|
{
|
||||||
|
char* serialized = voteGranted2Str(pVotesGranted);
|
||||||
|
assert(serialized != NULL);
|
||||||
|
printf("%s\n", serialized);
|
||||||
|
free(serialized);
|
||||||
|
}
|
||||||
|
|
||||||
|
voteGrantedVote(pVotesGranted, reply);
|
||||||
|
{
|
||||||
|
char* serialized = voteGranted2Str(pVotesGranted);
|
||||||
|
assert(serialized != NULL);
|
||||||
|
printf("%s\n", serialized);
|
||||||
|
free(serialized);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
printf("---------------------------------------\n");
|
||||||
|
voteGrantedReset(pVotesGranted, 123456789);
|
||||||
|
{
|
||||||
|
char* serialized = voteGranted2Str(pVotesGranted);
|
||||||
|
assert(serialized != NULL);
|
||||||
|
printf("%s\n", serialized);
|
||||||
|
free(serialized);
|
||||||
|
}
|
||||||
|
|
||||||
|
voteGrantedDestroy(pVotesGranted);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
Loading…
Reference in New Issue