From 0447a38b664b04ad76465c3440091040e32d544d Mon Sep 17 00:00:00 2001 From: cooper-lzy <78672629+cooper-lzy@users.noreply.github.com> Date: Tue, 26 Apr 2022 14:17:16 +0800 Subject: [PATCH 01/12] Update source_manage-service.md --- docs-2.0/reuse/source_manage-service.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs-2.0/reuse/source_manage-service.md b/docs-2.0/reuse/source_manage-service.md index d2f6261e6b7..0933dcde000 100644 --- a/docs-2.0/reuse/source_manage-service.md +++ b/docs-2.0/reuse/source_manage-service.md @@ -41,11 +41,11 @@ $ sudo /usr/local/nebula/scripts/nebula.service ## 使用 systemd 管理服务 -为方便使用，Nebula Graph 支持用 systemd 管理服务，通过`systemctl`启动、停止、重启和查看服务。 +为方便使用，Nebula Graph 企业版支持用 systemd 管理服务，通过`systemctl`启动、停止、重启和查看服务。 !!! note - 安装 Nebula Graph 后，systemd 所需的`.service`文件在安装目录的`etc/unit`目录内，使用 RPM/DEB 包安装的 Nebula Graph，会自动将这些`.service`文件放入`/usr/lib/systemd/system`目录内，并且`ExecStart`也会根据指定的 Nebula Graph 安装路径进行生成，因此可以直接使用`systemctl`命令。 + 安装 Nebula Graph 企业版后，systemd 所需的`.service`文件在安装目录的`etc/unit`目录内，使用 RPM/DEB 包安装的 Nebula Graph，会自动将这些`.service`文件放入`/usr/lib/systemd/system`目录内，并且`ExecStart`也会根据指定的 Nebula Graph 安装路径进行生成，因此可以直接使用`systemctl`命令。 其他方式安装 Nebula Graph，需要用户手动将`.service`文件移动到`/usr/lib/systemd/system`目录内，并修改`.service`文件内的`ExecStart`的文件路径，才可以正常使用`systemctl`命令。 From 82006726dde9a066bbfb0fe20bb4f200802e4a22 Mon Sep 17 00:00:00 2001 From: cooper-lzy <78672629+cooper-lzy@users.noreply.github.com> Date: Tue, 26 Apr 2022 14:32:13 +0800 Subject: [PATCH 02/12] Update 1.configurations.md --- .../1.configurations/1.configurations.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs-2.0/5.configurations-and-logs/1.configurations/1.configurations.md b/docs-2.0/5.configurations-and-logs/1.configurations/1.configurations.md index 1a4bb36803a..4ddf9590994 100644 --- a/docs-2.0/5.configurations-and-logs/1.configurations/1.configurations.md +++ b/docs-2.0/5.configurations-and-logs/1.configurations/1.configurations.md @@ -4,7 +4,7 @@ Nebula Graph 基于 [gflags](https://gflags.github.io/gflags/) 库打造了系 !!! enterpriseonly - 性能、参数、查询语句的调优方式及服务。 + 性能、参数、查询语句的调优方式及服务仅在企业版提供。 !!! note From 29c90ae8c8e4dfe68fd51c7bafafd2de8bb085e5 Mon Sep 17 00:00:00 2001 From: cooper-lzy <78672629+cooper-lzy@users.noreply.github.com> Date: Tue, 26 Apr 2022 14:40:19 +0800 Subject: [PATCH 03/12] Update 1.configurations.md --- .../1.configurations/1.configurations.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs-2.0/5.configurations-and-logs/1.configurations/1.configurations.md b/docs-2.0/5.configurations-and-logs/1.configurations/1.configurations.md index 4ddf9590994..76054e12762 100644 --- a/docs-2.0/5.configurations-and-logs/1.configurations/1.configurations.md +++ b/docs-2.0/5.configurations-and-logs/1.configurations/1.configurations.md @@ -8,12 +8,12 @@ Nebula Graph 基于 [gflags](https://gflags.github.io/gflags/) 库打造了系 !!! note - * 由于配置项数多且可能随着 Nebula Graph 的开发发生变化，文档不会介绍所有配置项。按下文说明可在命令行获取配置项的详细说明。 + * 由于配置项多且可能随着 Nebula Graph 的开发发生变化，文档不会介绍所有配置项。按下文说明可在命令行获取配置项的详细说明。 * 不建议修改文档未介绍的配置项，除非已经熟悉源代码并完全了解配置项的作用。 !!! compatibility "历史版本兼容性" - 1.x 版本的文档提供了使用 CONFIGS 命令修改缓存中配置的方法，但在生产环境中使用该方法容易导致集群配置与本地配置文件不一致。因此，2.x 版本的文档中将不再介绍 CONFIGS 命令的使用方法。 + 1.x 版本的文档提供了使用 CONFIGS 命令修改缓存中配置的方法，但在生产环境中使用该方法容易导致集群配置与本地配置文件不一致。因此，自 2.x 版本开始文档中将不再介绍 CONFIGS 命令的使用方法。 ## 查看配置项列表与说明 From 113dc3e55491e26ee967f956502761c6c295a44f Mon Sep 17 00:00:00 2001 From: cooper-lzy <78672629+cooper-lzy@users.noreply.github.com> Date: Tue, 26 Apr 2022 14:47:26 +0800 Subject: [PATCH 04/12] Update 3.graph-config.md --- .../1.configurations/3.graph-config.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/docs-2.0/5.configurations-and-logs/1.configurations/3.graph-config.md b/docs-2.0/5.configurations-and-logs/1.configurations/3.graph-config.md index 83c6a206949..ddf074fbe86 100644 --- a/docs-2.0/5.configurations-and-logs/1.configurations/3.graph-config.md +++ b/docs-2.0/5.configurations-and-logs/1.configurations/3.graph-config.md @@ -101,7 +101,11 @@ Graph 服务提供了两份初始配置文件`nebula-graphd.conf.default`和`neb ## audit 配置 -仅 Nebula Graph 企业版支持审计日志功能。详细参数说明参见[审计日志](../2.log-management/audit-log.md)。 +!!! enterpriseonly + + 仅 Nebula Graph 企业版支持审计日志功能。 + +详细参数说明参见[审计日志](../2.log-management/audit-log.md)。 ## metrics 配置 From 4961720c75b1025bb9dbbe2b29ce69aff5a18dba Mon Sep 17 00:00:00 2001 From: cooper-lzy <78672629+cooper-lzy@users.noreply.github.com> Date: Tue, 26 Apr 2022 14:49:43 +0800 Subject: [PATCH 05/12] Update 4.storage-config.md --- .../1.configurations/4.storage-config.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/docs-2.0/5.configurations-and-logs/1.configurations/4.storage-config.md b/docs-2.0/5.configurations-and-logs/1.configurations/4.storage-config.md index d2c4bdfc845..5b5f0b13456 100644 --- a/docs-2.0/5.configurations-and-logs/1.configurations/4.storage-config.md +++ b/docs-2.0/5.configurations-and-logs/1.configurations/4.storage-config.md @@ -193,10 +193,6 @@ rocksdb options 配置的格式为`{"":""}`，多个 | :------------------- | :------------------------ | :------------------------------------------ | | max_edge_returned_per_vertex | 2147483647 | 每个稠密点，最多返回多少条边，多余的边截断不返回。配置文件默认未设置。 | -!!! compatibility - - Nebula Graph 1.x 中的蓄水池采样方法在 Nebula Graph {{ nebula.release }} 不再支持。 - ## 数据量大而内存不够时 如果数据量很大但内存不够，则推荐把 storage 配置中的 `enable_partitioned_index_filter` 设置为 `true`；但由于缓存了较少的 RocksDB 索引，性能会受影响。 From 341eba6ec7844cb084d1f32d75d7979ba6e9aee5 Mon Sep 17 00:00:00 2001 From: "abby.huang" <78209557+abby-cyber@users.noreply.github.com> Date: Tue, 26 Apr 2022 15:05:25 +0800 Subject: [PATCH 06/12] Update mkdocs.yml (#1729) --- mkdocs.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mkdocs.yml b/mkdocs.yml index 5a154bb743b..11e16fa4246 100755 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -91,9 +91,9 @@ extra: release: 3.1.0 branch: release-3.1 dashboard: - release: 3.0.0 + release: 1.1.0 base100: 1.0.0 - branch: release-3.0 + branch: v1.1.0 dashboard_ent: release: 3.0.0 console: From a62344d41b6e9617c0c2a6397275d16502fe0765 Mon Sep 17 00:00:00 2001 From: cooper-lzy <78672629+cooper-lzy@users.noreply.github.com> Date: Tue, 26 Apr 2022 15:07:57 +0800 Subject: [PATCH 07/12] Update 2.compile-br.md --- docs-2.0/backup-and-restore/nebula-br/2.compile-br.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs-2.0/backup-and-restore/nebula-br/2.compile-br.md b/docs-2.0/backup-and-restore/nebula-br/2.compile-br.md index f8acbae645d..ab620797969 100644 --- a/docs-2.0/backup-and-restore/nebula-br/2.compile-br.md +++ b/docs-2.0/backup-and-restore/nebula-br/2.compile-br.md @@ -31,7 +31,7 @@ ```bash [nebula-br]$ bin/br version -Nebula Backup And Restore Utility Tool,V-0.6.0 +Nebula Backup And Restore Utility Tool,V-{{br.release}} GitSha: 079e7c7 GitRef: master please run "help" subcommand for more infomation. From 2f1dc3dfa9396fa9f8dfa9ba365867c9bf338733 Mon Sep 17 00:00:00 2001 From: Steam Date: Tue, 26 Apr 2022 15:16:35 +0800 Subject: [PATCH 08/12] rename url and modify format (#1728) * rename url and modify format * fix conflict and modify format --- docs-2.0/20.appendix/{releasenote.md => release-notes.md} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename docs-2.0/20.appendix/{releasenote.md => release-notes.md} (95%) diff --git a/docs-2.0/20.appendix/releasenote.md b/docs-2.0/20.appendix/release-notes.md similarity index 95% rename from docs-2.0/20.appendix/releasenote.md rename to docs-2.0/20.appendix/release-notes.md index 340b408cfd1..ba66f9bf11a 100644 --- a/docs-2.0/20.appendix/releasenote.md +++ b/docs-2.0/20.appendix/release-notes.md @@ -9,7 +9,7 @@ - 优化路径以减少冗余路径和时间复杂度。[#4126](https://github.com/vesoft-inc/nebula/pull/4162) - 优化获取属性的方式进而优化`MATCH`语句的性能。[#3750](https://github.com/vesoft-inc/nebula/pull/3750) - 优化`GO`、`YIELD`子句，减少不必要的属性读取。[#3974](https://github.com/vesoft-inc/nebula/pull/3974) -- 支持获取属性时 Filter 及 Limit 下推。 [#3844](https://github.com/vesoft-inc/nebula/pull/3844) [#3839](https://github.com/vesoft-inc/nebula/pull/3839) +- 支持获取属性时 Filter 及`LIMIT`下推。 [#3844](https://github.com/vesoft-inc/nebula/pull/3844) [#3839](https://github.com/vesoft-inc/nebula/pull/3839) - 支持`LOOKUP`聚合下推。[#3504](https://github.com/vesoft-inc/nebula/pull/3504) - `maxHop`在匹配可变长度路径中是可选的。[#3881](https://github.com/vesoft-inc/nebula/pull/3881) - 使用`DROP SPACE`之后图空间将进行物理删除。[#3913](https://github.com/vesoft-inc/nebula/pull/3913) @@ -28,7 +28,7 @@ - 新增`KILL QUERY`的权限检查。当启用身份验证时，具有 GOD 角色的用户可以终止所有查询，而具有其他角色的用户只能终止自己的查询。[#3896](https://github.com/vesoft-inc/nebula/pull/3896) - 新增 distcc、sccache 等编译方式的支持。[#3896](https://github.com/vesoft-inc/nebula/pull/3896) - meta dump 工具支持更多可 dump 的表。[#3870](https://github.com/vesoft-inc/nebula/pull/3870) -- 存储层将写操作（INSERT VERTEX 或者 EDGE）的并发控制，从报错并要求客户端重试，改为内部排队，以便客户端更简单适配。[#3926](https://github.com/vesoft-inc/nebula/pull/3926) +- 存储层将写操作（`INSERT VERTEX`或者`INSERT EDGE`）的并发控制，从报错并要求客户端重试，改为内部排队，以便客户端更简单适配。[#3926](https://github.com/vesoft-inc/nebula/pull/3926) ## 缺陷修复 From 13e483fb386a99eb476f230994758ac53e8b3dd3 Mon Sep 17 00:00:00 2001 From: cooper-lzy <78672629+cooper-lzy@users.noreply.github.com> Date: Tue, 26 Apr 2022 15:21:43 +0800 Subject: [PATCH 09/12] Update replication-between-clusters.md --- .../replication-between-clusters.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs-2.0/synchronization-and-migration/replication-between-clusters.md b/docs-2.0/synchronization-and-migration/replication-between-clusters.md index 1fdfca504a3..4bba5e04bc6 100644 --- a/docs-2.0/synchronization-and-migration/replication-between-clusters.md +++ b/docs-2.0/synchronization-and-migration/replication-between-clusters.md @@ -283,7 +283,7 @@ drainer：机器 IP 地址为`192.168.10.104`，只启动 drainer 服务。 !!! note - 在切换主从之前需要为新的主集群搭建并启动 listener 服务（示例 IP 为`192.168.10.105`），为新的从集群搭建并启动 drainer 服务（示例 IP 为`192.168.10.106`）。 + 在切换主从之前需要为新的主集群搭建并启动 listener 服务（示例 IP 为`192.168.10.105`），为新的从集群搭建并启动 drainer 服务（示例 IP 为`192.168.10.106`）。 1. 登录主集群，取消 drainer 和 listener 服务。 From 6d81e50c21d0854f08a6ba579898e3c4a08cf7a2 Mon Sep 17 00:00:00 2001 From: "abby.huang" <78209557+abby-cyber@users.noreply.github.com> Date: Tue, 26 Apr 2022 15:39:20 +0800 Subject: [PATCH 10/12] Update 2.deploy-connect-dashboard-ent.md (#1731) * Update 2.deploy-connect-dashboard-ent.md * Update 2.deploy-connect-dashboard-ent.md --- docs-2.0/nebula-dashboard-ent/2.deploy-connect-dashboard-ent.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs-2.0/nebula-dashboard-ent/2.deploy-connect-dashboard-ent.md b/docs-2.0/nebula-dashboard-ent/2.deploy-connect-dashboard-ent.md index 208c6ab50a4..ef95323fad4 100644 --- a/docs-2.0/nebula-dashboard-ent/2.deploy-connect-dashboard-ent.md +++ b/docs-2.0/nebula-dashboard-ent/2.deploy-connect-dashboard-ent.md @@ -18,6 +18,7 @@ | 9090 | Prometheus 服务的端口。 | | 9200 | nebula-stats-exporter 服务的端口。 | | 9093 | Alertmanager 服务的端口。接收 Prometheus 告警，发送告警通知给 Dashboard。| + | 9100 | node-exporter 的服务端口。在集群创建后，自动部署在目标机器内，收集集群中机器的资源信息，包括 CPU、内存、负载、磁盘和流量。 | - 准备 License。 From 8a64e94fe8505c6984a6037079a99f2721381b1f Mon Sep 17 00:00:00 2001 From: cooper-lzy <78672629+cooper-lzy@users.noreply.github.com> Date: Tue, 26 Apr 2022 15:51:54 +0800 Subject: [PATCH 11/12] switch sync data (#1732) --- .../1.nGQL-overview/keywords-and-reserved-words.md | 1 + .../replication-between-clusters.md | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/docs-2.0/3.ngql-guide/1.nGQL-overview/keywords-and-reserved-words.md b/docs-2.0/3.ngql-guide/1.nGQL-overview/keywords-and-reserved-words.md index 43b00323538..3137c0e78ae 100644 --- a/docs-2.0/3.ngql-guide/1.nGQL-overview/keywords-and-reserved-words.md +++ b/docs-2.0/3.ngql-guide/1.nGQL-overview/keywords-and-reserved-words.md @@ -106,6 +106,7 @@ PROP REBUILD RECOVER REMOVE +RESTART RETURN REVERSELY REVOKE diff --git a/docs-2.0/synchronization-and-migration/replication-between-clusters.md b/docs-2.0/synchronization-and-migration/replication-between-clusters.md index 4bba5e04bc6..f3e36c6f1e7 100644 --- a/docs-2.0/synchronization-and-migration/replication-between-clusters.md +++ b/docs-2.0/synchronization-and-migration/replication-between-clusters.md @@ -277,6 +277,14 @@ drainer：机器 IP 地址为`192.168.10.104`，只启动 drainer 服务。 +-------------+ ``` +## 停止/重启数据同步 + +数据同步时，listener 会持续发送 WAL 给 drainer。 + +如果需要停止数据同步，可以使用`stop sync`命令。此时 listener 会停止向 drainer 发送 WAL。 + +如果需要重启数据同步，可以使用`restart sync`命令。此时 listener 会向 drainer 发送停止期间堆积的 WAL。如果 listener 上的 WAL 丢失， listener 会从主集群拉取快照重新进行同步。 + ## 切换主从集群 如果因为业务需要进行数据迁移，或者灾备恢复后需要切换主从集群，需要手动进行切换。 From 987ec021fd1aea36e771d9eeea8bcb2dc2968086 Mon Sep 17 00:00:00 2001 From: Steam Date: Tue, 26 Apr 2022 16:06:57 +0800 Subject: [PATCH 12/12] modify error description (#1733) --- docs-2.0/20.appendix/release-notes.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs-2.0/20.appendix/release-notes.md b/docs-2.0/20.appendix/release-notes.md index ba66f9bf11a..85987b1c6ed 100644 --- a/docs-2.0/20.appendix/release-notes.md +++ b/docs-2.0/20.appendix/release-notes.md @@ -39,8 +39,8 @@ - 修复获取`profile`查询的 JSON 结果导致的崩溃问题。[#3998](https://github.com/vesoft-inc/nebula/pull/3998) - 修复 Lambda 函数中的`async`接口运行完毕且`threadManager`中的任务未执行时的崩溃问题。[#4000](https://github.com/vesoft-inc/nebula/pull/4000) - 修复`GROUP BY`输出的缺陷。[#4128](https://github.com/vesoft-inc/nebula/pull/4128) -- 修复`SHOW HOSTS`有时不能不显示版本的缺陷。[#4116](https://github.com/vesoft-inc/nebula/pull/4116) -- 修复`id(n) == $var`，`id(n) IN [$var]`， `id(n) == $var.foo.bar`， `id(n) IN $var.foo.bar`参数化的缺陷。[#4024](https://github.com/vesoft-inc/nebula/pull/4024) +- 修复`SHOW HOSTS`有时不能显示版本的缺陷。[#4116](https://github.com/vesoft-inc/nebula/pull/4116) +- 修复`id(n) == $var`，`id(n) IN [$var]`，`id(n) == $var.foo.bar`，`id(n) IN $var.foo.bar`参数化的缺陷。[#4024](https://github.com/vesoft-inc/nebula/pull/4024) - 修复`MATCH...WHERE`中出现错误路径方向的缺陷。[#4091](https://github.com/vesoft-inc/nebula/pull/4091) - 修复`WHERE`子句同时引用多`MATCH`变量结果显示不正确的缺陷。 [#4143](https://github.com/vesoft-inc/nebula/pull/4143) - 修复优化规则的缺陷。[#4146](https://github.com/vesoft-inc/nebula/pull/4146)