diff --git a/source/libs/sync/test/syncTest.cpp b/source/libs/sync/test/syncTest.cpp index 035ed5462900e4dc0e632714324812c81c7d924e..0f72fd822f06ccde72d01af1a085b4d609c43533 100644 --- a/source/libs/sync/test/syncTest.cpp +++ b/source/libs/sync/test/syncTest.cpp @@ -2,6 +2,7 @@ #include "syncIO.h" #include "syncInt.h" #include "syncRaftStore.h" +#include "gtest/gtest.h" void *pingFunc(void *param) { SSyncIO *io = (SSyncIO *)param; @@ -26,32 +27,32 @@ int main() { sFatal("sync log test: fatal"); SRaftStore *pRaftStore = raftStoreOpen("./raft_store.json"); - assert(pRaftStore != NULL); + // assert(pRaftStore != NULL); - raftStorePrint(pRaftStore); + // raftStorePrint(pRaftStore); - pRaftStore->currentTerm = 100; - pRaftStore->voteFor.addr = 200; - pRaftStore->voteFor.vgId = 300; + // pRaftStore->currentTerm = 100; + // pRaftStore->voteFor.addr = 200; + // pRaftStore->voteFor.vgId = 300; - raftStorePrint(pRaftStore); + // raftStorePrint(pRaftStore); - raftStorePersist(pRaftStore); + // raftStorePersist(pRaftStore); - sDebug("sync test"); + // sDebug("sync test"); - SSyncIO *syncIO = syncIOCreate(); - assert(syncIO != NULL); + // SSyncIO *syncIO = syncIOCreate(); + // assert(syncIO != NULL); - syncIO->start(syncIO); + // syncIO->start(syncIO); - sleep(2); + // sleep(2); - pthread_t tid; - pthread_create(&tid, NULL, pingFunc, syncIO); + // pthread_t tid; + // pthread_create(&tid, NULL, pingFunc, syncIO); - while (1) { - sleep(1); - } + // while (1) { + // sleep(1); + // } return 0; } diff --git a/source/os/src/osFile.c b/source/os/src/osFile.c index c34513a2f12c824ffb2e889b88fdbd55318bfdb6..2d8314058ec4122cacfb3eab1109c06ddd3d7657 100644 --- a/source/os/src/osFile.c +++ b/source/os/src/osFile.c @@ -240,6 +240,7 @@ int64_t taosCloseFile(TdFilePtr *ppFile) { return 0; } fflush((*ppFile)->fp); + fsync((*ppFile)->fd); close((*ppFile)->fd); (*ppFile)->fd = -1; (*ppFile)->fp = NULL; @@ -295,12 +296,16 @@ int64_t taosWriteFile(TdFilePtr pFile, const void *buf, int64_t count) { if (errno == EINTR) { continue; } + fflush(pFile->fp); + fsync(pFile->fd); return -1; } nleft -= nwritten; tbuf += nwritten; } + fflush(pFile->fp); + fsync(pFile->fd); return count; }