From 7a39b3296157439d66239e4d48ca1eb96635c4ea Mon Sep 17 00:00:00 2001 From: wangmm0220 Date: Fri, 3 Nov 2023 16:33:48 +0800 Subject: [PATCH] fix:add windows support --- source/common/src/tglobal.c | 4 ++++ source/util/src/rsync.c | 15 ++++++++------- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/source/common/src/tglobal.c b/source/common/src/tglobal.c index 39410dc8ae..639e300179 100644 --- a/source/common/src/tglobal.c +++ b/source/common/src/tglobal.c @@ -135,7 +135,11 @@ char tsSmlAutoChildTableNameDelimiter[TSDB_TABLE_NAME_LEN] = ""; // checkpoint backup char tsSnodeIp[TSDB_FQDN_LEN] = {0}; +#ifdef WINDOWS +char tsCheckpointBackupDir[PATH_MAX] = "/c/TDengine/data/backup/checkpoint/"; +#else char tsCheckpointBackupDir[PATH_MAX] = "/var/lib/taos/backup/checkpoint/"; +#endif // tmq int32_t tmqMaxTopicNum = 20; diff --git a/source/util/src/rsync.c b/source/util/src/rsync.c index b31526dc48..e3908e53ba 100644 --- a/source/util/src/rsync.c +++ b/source/util/src/rsync.c @@ -47,8 +47,10 @@ static int generateConfigFile(char* confDir){ char confContent[PATH_MAX*4] = {0}; snprintf(confContent, PATH_MAX*4, +#ifndef WINDOWS "uid = root\n" "gid = root\n" +#endif "use chroot = false\n" "max connections = 200\n" "timeout = 100\n" @@ -84,7 +86,12 @@ static int execCommand(char* command){ } void stopRsync(){ - int code = system("pkill rsync"); + int code = +#ifdef WINDOWS + system("taskkill /f /mi rsync.exe"); +#else + system("pkill rsync"); +#endif if(code != 0){ uError("[rsync] stop rsync server failed,"ERRNO_ERR_FORMAT, ERRNO_ERR_DATA); return; @@ -120,12 +127,6 @@ void startRsync(){ int uploadRsync(char* id, char* path){ char command[PATH_MAX] = {0}; -// char* name = strrchr(fullName, '/'); -// if(name == NULL){ -// uError("[rsync] file name invalid, name:%s", name); -// return -1; -// } -// name = name + 1; if(path[strlen(path) - 1] != '/'){ snprintf(command, PATH_MAX, "rsync -av --delete --timeout=10 --bwlimit=100000 %s/ rsync://%s/checkpoint/%s/", path, tsSnodeIp, id);