diff --git a/Jenkinsfile2 b/Jenkinsfile2 index dc94999058..249a8d1c9d 100644 --- a/Jenkinsfile2 +++ b/Jenkinsfile2 @@ -505,7 +505,7 @@ pipeline { } } stage('linux test') { - agent{label "slave1_47 || slave1_48 || slave1_49 || slave1_50 "} + agent{label "slave1_47 || slave1_48 || slave1_49 || slave1_50 || slave1_52 || slave1_59 || slave1_63 || worker03 || slave215 || slave217 || slave219 "} options { skipDefaultCheckout() } when { changeRequest() diff --git a/source/util/src/tlog.c b/source/util/src/tlog.c index 5433ed2eed..693935575a 100644 --- a/source/util/src/tlog.c +++ b/source/util/src/tlog.c @@ -1198,7 +1198,7 @@ static void *taosAsyncOutputLog(void *param) { break; } - // process the log rotation every LOG_ROTATE_INTERVAL minutes + // process the log rotation every LOG_ROTATE_INTERVAL int64_t curSec = taosGetTimestampMs() / 1000; if (curSec >= lastCheckSec) { if ((curSec - lastCheckSec) >= LOG_ROTATE_INTERVAL) { diff --git a/source/util/src/tutil.c b/source/util/src/tutil.c index 306b15909d..dd3c6ece40 100644 --- a/source/util/src/tutil.c +++ b/source/util/src/tutil.c @@ -543,7 +543,7 @@ bool tIsValidFileName(const char *fileName, const char *pattern) { } bool tIsValidFilePath(const char *filePath, const char *pattern) { - const char *filePathPattern = "^[a-zA-Z0-9/\\_.-]+$"; + const char *filePathPattern = "^[a-zA-Z0-9:/\\_.-]+$"; return tIsValidFileName(filePath, pattern ? pattern : filePathPattern); } \ No newline at end of file