From 3d32d55ea5c6abe71269fbecfb3de1d5fc58ef20 Mon Sep 17 00:00:00 2001 From: kailixu Date: Thu, 12 Oct 2023 16:44:55 +0800 Subject: [PATCH 1/8] enh: close stt before untake read snap --- source/dnode/vnode/src/tsdb/tsdbRead2.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/source/dnode/vnode/src/tsdb/tsdbRead2.c b/source/dnode/vnode/src/tsdb/tsdbRead2.c index b6762df3b7..aaa4e92328 100644 --- a/source/dnode/vnode/src/tsdb/tsdbRead2.c +++ b/source/dnode/vnode/src/tsdb/tsdbRead2.c @@ -4066,13 +4066,6 @@ void tsdbReaderClose2(STsdbReader* pReader) { tsdbDataFileReaderClose(&pReader->pFileReader); } - qTrace("tsdb/reader-close: %p, untake snapshot", pReader); - tsdbUntakeReadSnap2(pReader, pReader->pReadSnap, true); - pReader->pReadSnap = NULL; - - tsdbReleaseReader(pReader); - tsdbUninitReaderLock(pReader); - SCostSummary* pCost = &pReader->cost; SFilesetIter* pFilesetIter = &pReader->status.fileIter; if (pFilesetIter->pLastBlockReader != NULL) { @@ -4084,6 +4077,13 @@ void tsdbReaderClose2(STsdbReader* pReader) { destroySttBlockReader(pReader->status.pLDataIterArray, &pCost->sttCost); taosMemoryFreeClear(pReader->status.uidList.tableUidList); + qTrace("tsdb/reader-close: %p, untake snapshot", pReader); + tsdbUntakeReadSnap2(pReader, pReader->pReadSnap, true); + pReader->pReadSnap = NULL; + + tsdbReleaseReader(pReader); + tsdbUninitReaderLock(pReader); + tsdbDebug( "%p :io-cost summary: head-file:%" PRIu64 ", head-file time:%.2f ms, SMA:%" PRId64 " SMA-time:%.2f ms, fileBlocks:%" PRId64 From 135c411bd573ac4e3b981d6679eff1f4c3682e04 Mon Sep 17 00:00:00 2001 From: kailixu Date: Thu, 12 Oct 2023 17:27:16 +0800 Subject: [PATCH 2/8] enh: set thread name for windows --- include/os/osDef.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/include/os/osDef.h b/include/os/osDef.h index c18728c9a7..bad4536fa6 100644 --- a/include/os/osDef.h +++ b/include/os/osDef.h @@ -225,7 +225,10 @@ void syslog(int unused, const char *format, ...); #endif #else // Windows -#define setThreadName(name) +#define setThreadName(name) \ + do { \ + pthread_setname_np(taosThreadSelf(), (name)); \ + } while (0) #endif #if defined(_WIN32) From 82121ba98520328e94a65c75a32814c789dd072e Mon Sep 17 00:00:00 2001 From: Wade Zhang Date: Fri, 13 Oct 2023 15:00:59 +0800 Subject: [PATCH 3/8] docs: resolve broken links --- docs/en/10-deployment/01-deploy.md | 2 +- docs/en/14-reference/05-taosbenchmark.md | 2 +- docs/en/14-reference/14-taosKeeper.md | 2 +- docs/en/20-third-party/11-kafka.md | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/en/10-deployment/01-deploy.md b/docs/en/10-deployment/01-deploy.md index e204f7765e..4a6a3aae41 100644 --- a/docs/en/10-deployment/01-deploy.md +++ b/docs/en/10-deployment/01-deploy.md @@ -12,7 +12,7 @@ The FQDN of all hosts must be setup properly. For e.g. FQDNs may have to be conf ### Step 1 -If any previous version of TDengine has been installed and configured on any host, the installation needs to be removed and the data needs to be cleaned up. For details about uninstalling please refer to [Install and Uninstall](../../operation/pkg-install). To clean up the data, please use `rm -rf /var/lib/taos/\*` assuming the `dataDir` is configured as `/var/lib/taos`. +If any previous version of TDengine has been installed and configured on any host, the installation needs to be removed and the data needs to be cleaned up. To clean up the data, please use `rm -rf /var/lib/taos/\*` assuming the `dataDir` is configured as `/var/lib/taos`. :::note FQDN information is written to file. If you have started TDengine without configuring or changing the FQDN, ensure that data is backed up or no longer needed before running the `rm -rf /var/lib\taos/\*` command. diff --git a/docs/en/14-reference/05-taosbenchmark.md b/docs/en/14-reference/05-taosbenchmark.md index e052c0d02b..8e5ee178a4 100644 --- a/docs/en/14-reference/05-taosbenchmark.md +++ b/docs/en/14-reference/05-taosbenchmark.md @@ -13,7 +13,7 @@ taosBenchmark (formerly taosdemo ) is a tool for testing the performance of TDen There are two ways to install taosBenchmark: -- Installing the official TDengine installer will automatically install taosBenchmark. Please refer to [TDengine installation](../../operation/pkg-install) for details. +- Installing the official TDengine installer will automatically install taosBenchmark. - Compile taos-tools separately and install them. Please refer to the [taos-tools](https://github.com/taosdata/taos-tools) repository for details. diff --git a/docs/en/14-reference/14-taosKeeper.md b/docs/en/14-reference/14-taosKeeper.md index 48b3d04b24..a289ecf35f 100644 --- a/docs/en/14-reference/14-taosKeeper.md +++ b/docs/en/14-reference/14-taosKeeper.md @@ -16,7 +16,7 @@ taosKeeper is a tool for TDengine that exports monitoring metrics. With taosKeep There are two ways to install taosKeeper: Methods of installing taosKeeper: -- Installing the official TDengine installer will automatically install taosKeeper. Please refer to [TDengine installation](../../operation/pkg-install) for details. +- Installing the official TDengine installer will automatically install taosKeeper. - You can compile taosKeeper separately and install it. Please refer to the [taosKeeper](https://github.com/taosdata/taoskeeper) repository for details. ## Configuration and Launch diff --git a/docs/en/20-third-party/11-kafka.md b/docs/en/20-third-party/11-kafka.md index 02a12e55bc..64c0f0bd48 100644 --- a/docs/en/20-third-party/11-kafka.md +++ b/docs/en/20-third-party/11-kafka.md @@ -21,7 +21,7 @@ TDengine Source Connector is used to read data from TDengine in real-time and se 1. Linux operating system 2. Java 8 and Maven installed 3. Git/curl/vi is installed -4. TDengine is installed and started. If not, please refer to [Installation and Uninstallation](../../operation/pkg-install) +4. TDengine is installed and started. ## Install Kafka From 9b3266fbcfbcac90f9151beb5e2bac51f6065fbd Mon Sep 17 00:00:00 2001 From: Wade Zhang Date: Fri, 13 Oct 2023 15:08:34 +0800 Subject: [PATCH 4/8] docs: resolve broken links --- docs/en/13-operation/10-monitor.md | 2 -- docs/zh/17-operation/06-monitor.md | 4 ---- 2 files changed, 6 deletions(-) diff --git a/docs/en/13-operation/10-monitor.md b/docs/en/13-operation/10-monitor.md index 2a667c132f..b08216a9c4 100644 --- a/docs/en/13-operation/10-monitor.md +++ b/docs/en/13-operation/10-monitor.md @@ -41,8 +41,6 @@ An existing Grafana Notification Channel can be specified with parameter `-E`, t Launch `TDinsight.sh` with the command above and restart Grafana, then open Dashboard `http://localhost:3000/d/tdinsight`. -For more use cases and restrictions please refer to [TDinsight](/reference/tdinsight/). - ## log database The data of tdinsight dashboard is stored in `log` database (default. You can change it in taoskeeper's config file. For more infrmation, please reference to [taoskeeper document](/reference/taosKeeper)). The taoskeeper will create log database on taoskeeper startup. diff --git a/docs/zh/17-operation/06-monitor.md b/docs/zh/17-operation/06-monitor.md index 563a7fc6f7..757dc3c69d 100644 --- a/docs/zh/17-operation/06-monitor.md +++ b/docs/zh/17-operation/06-monitor.md @@ -9,8 +9,6 @@ TDengine 通过 [taosKeeper](/reference/taosKeeper/) 将服务器的 CPU、内 ## TDinsight - 使用监控数据库 + Grafana 对 TDengine 进行监控的解决方案 -监控数据库将提供更多的监控项，您可以从 [TDinsight Grafana Dashboard](/reference/tdinsight/) 了解如何使用 TDinsight 方案对 TDengine 进行监控。 - 我们提供了一个自动化脚本 `TDinsight.sh` 对 TDinsight 进行部署。 下载 `TDinsight.sh`： @@ -37,8 +35,6 @@ chmod +x TDinsight.sh 运行程序并重启 Grafana 服务，打开面板：`http://localhost:3000/d/tdinsight`。 -更多使用场景和限制请参考[TDinsight](/reference/tdinsight/) 文档。 - ## log 库 TDinsight dashboard 数据来源于 log 库（存放监控数据的默认db，可以在 taoskeeper 配置文件中修改，具体参考 [taoskeeper 文档](/reference/taosKeeper)）。taoskeeper 启动后会自动创建 log 库，并将监控数据写入到该数据库中。 From 0ee8e6d04a29227eece309f89a0b79ec976e6eaa Mon Sep 17 00:00:00 2001 From: kailixu Date: Fri, 13 Oct 2023 16:24:08 +0800 Subject: [PATCH 5/8] chore: update libdmodule for darwin --- deps/darwin/arm/dm_static/libdmodule.a | Bin 27160 -> 27144 bytes deps/darwin/x64/dm_static/libdmodule.a | Bin 26888 -> 26888 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/deps/darwin/arm/dm_static/libdmodule.a b/deps/darwin/arm/dm_static/libdmodule.a index b9dc621e1cd810102b8f9d66ec9e97d23e189c78..22d14a84d0e3d3b5bc547131a48e1bda56367475 100644 GIT binary patch delta 11069 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 delta 11103 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 s>7ag)6}$9 Date: Fri, 13 Oct 2023 23:00:17 +0800 Subject: [PATCH 6/8] chore: update format to resolve conflict with main --- docs/en/14-reference/05-taosbenchmark.md | 2 +- docs/en/20-third-party/11-kafka.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/en/14-reference/05-taosbenchmark.md b/docs/en/14-reference/05-taosbenchmark.md index 8e5ee178a4..4744e143fc 100644 --- a/docs/en/14-reference/05-taosbenchmark.md +++ b/docs/en/14-reference/05-taosbenchmark.md @@ -13,7 +13,7 @@ taosBenchmark (formerly taosdemo ) is a tool for testing the performance of TDen There are two ways to install taosBenchmark: -- Installing the official TDengine installer will automatically install taosBenchmark. +- Installing the official TDengine installer will automatically install taosBenchmark. - Compile taos-tools separately and install them. Please refer to the [taos-tools](https://github.com/taosdata/taos-tools) repository for details. diff --git a/docs/en/20-third-party/11-kafka.md b/docs/en/20-third-party/11-kafka.md index 64c0f0bd48..b865c00bc3 100644 --- a/docs/en/20-third-party/11-kafka.md +++ b/docs/en/20-third-party/11-kafka.md @@ -21,7 +21,7 @@ TDengine Source Connector is used to read data from TDengine in real-time and se 1. Linux operating system 2. Java 8 and Maven installed 3. Git/curl/vi is installed -4. TDengine is installed and started. +4. TDengine is installed and started. ## Install Kafka From 6090e97cb650086cdfb08330409429e1c0ea301e Mon Sep 17 00:00:00 2001 From: kailixu Date: Sat, 14 Oct 2023 04:58:37 +0800 Subject: [PATCH 7/8] other: trigger CI From 9ba9d9dcaec7fe287a627b68b56150f2e5aef3c2 Mon Sep 17 00:00:00 2001 From: kailixu Date: Sat, 14 Oct 2023 05:16:39 +0800 Subject: [PATCH 8/8] other: trigger CI