From cec3fcdf7871cce33d658fda0ea8d68c0d62e528 Mon Sep 17 00:00:00 2001 From: yuanyuan8983 <99315889+yuanyuan8983@users.noreply.github.com> Date: Fri, 22 Sep 2023 09:09:06 +0800 Subject: [PATCH] [typo](doc) modifying old parameters (#24565) * modifying old parameters * Supplementary demo --- docs/en/docs/advanced/broker.md | 12 +++++++----- .../Data-Manipulation-Statements/Load/BROKER-LOAD.md | 1 + docs/zh-CN/docs/advanced/broker.md | 12 +++++++----- .../Data-Manipulation-Statements/Load/BROKER-LOAD.md | 1 + 4 files changed, 16 insertions(+), 10 deletions(-) diff --git a/docs/en/docs/advanced/broker.md b/docs/en/docs/advanced/broker.md index 65b55dc6a1..47e4c7bd83 100644 --- a/docs/en/docs/advanced/broker.md +++ b/docs/en/docs/advanced/broker.md @@ -132,8 +132,8 @@ Authentication information is usually provided as a Key-Value in the Property Ma The authentication method needs to provide the following information:: * `hadoop.security.authentication`: Specify the authentication method as kerberos. - * `kerberos_principal`: Specify the principal of kerberos. - * `kerberos_keytab`: Specify the path to the keytab file for kerberos. The file must be an absolute path to a file on the server where the broker process is located. And can be accessed by the Broker process. + * `hadoop.kerberos.principal`: Specify the principal of kerberos. + * `hadoop.kerberos.keytab`: Specify the path to the keytab file for kerberos. The file must be an absolute path to a file on the server where the broker process is located. And can be accessed by the Broker process. * `kerberos_keytab_content`: Specify the content of the keytab file in kerberos after base64 encoding. You can choose one of these with `kerberos_keytab` configuration. Examples are as follows: @@ -141,14 +141,14 @@ Authentication information is usually provided as a Key-Value in the Property Ma ``` ( "hadoop.security.authentication" = "kerberos", - "kerberos_principal" = "doris@YOUR.COM", - "kerberos_keytab" = "/home/doris/my.keytab" + "hadoop.kerberos.principal" = "doris@YOUR.COM", + "hadoop.kerberos.keytab" = "/home/doris/my.keytab" ) ``` ``` ( "hadoop.security.authentication" = "kerberos", - "kerberos_principal" = "doris@YOUR.COM", + "hadoop.kerberos.principal" = "doris@YOUR.COM", "kerberos_keytab_content" = "ASDOWHDLAWIDJHWLDKSALDJSDIWALD" ) ``` @@ -182,6 +182,7 @@ Authentication information is usually provided as a Key-Value in the Property Ma ``` ( + "fs.defaultFS" = "hdfs://my_ha", "dfs.nameservices" = "my_ha", "dfs.ha.namenodes.my_ha" = "my_namenode1, my_namenode2", "dfs.namenode.rpc-address.my_ha.my_namenode1" = "nn1_host:rpc_port", @@ -196,6 +197,7 @@ Authentication information is usually provided as a Key-Value in the Property Ma ( "username"="user", "password"="passwd", + "fs.defaultFS" = "hdfs://my_ha", "dfs.nameservices" = "my_ha", "dfs.ha.namenodes.my_ha" = "my_namenode1, my_namenode2", "dfs.namenode.rpc-address.my_ha.my_namenode1" = "nn1_host:rpc_port", diff --git a/docs/en/docs/sql-manual/sql-reference/Data-Manipulation-Statements/Load/BROKER-LOAD.md b/docs/en/docs/sql-manual/sql-reference/Data-Manipulation-Statements/Load/BROKER-LOAD.md index b6922bc41c..2136ad22f7 100644 --- a/docs/en/docs/sql-manual/sql-reference/Data-Manipulation-Statements/Load/BROKER-LOAD.md +++ b/docs/en/docs/sql-manual/sql-reference/Data-Manipulation-Statements/Load/BROKER-LOAD.md @@ -269,6 +269,7 @@ WITH BROKER broker_name ( "username" = "", "password" = "", + "fs.defaultFS" = "hdfs://my_ha", "dfs.nameservices" = "my_ha", "dfs.ha.namenodes.my_ha" = "my_namenode1, my_namenode2", "dfs.namenode.rpc-address.my_ha.my_namenode1" = "nn1_host:rpc_port", diff --git a/docs/zh-CN/docs/advanced/broker.md b/docs/zh-CN/docs/advanced/broker.md index b92c4200be..bb6058d5f8 100644 --- a/docs/zh-CN/docs/advanced/broker.md +++ b/docs/zh-CN/docs/advanced/broker.md @@ -123,8 +123,8 @@ WITH BROKER "broker_name" 该认证方式需提供以下信息: - `hadoop.security.authentication`:指定认证方式为 kerberos。 - - `kerberos_principal`:指定 kerberos 的 principal。 - - `kerberos_keytab`:指定 kerberos 的 keytab 文件路径。该文件必须为 Broker 进程所在服务器上的文件的绝对路径。并且可以被 Broker 进程访问。 + - `hadoop.kerberos.principal`:指定 kerberos 的 principal。 + - `hadoop.kerberos.keytab`:指定 kerberos 的 keytab 文件路径。该文件必须为 Broker 进程所在服务器上的文件的绝对路径。并且可以被 Broker 进程访问。 - `kerberos_keytab_content`:指定 kerberos 中 keytab 文件内容经过 base64 编码之后的内容。这个跟 `kerberos_keytab` 配置二选一即可。 示例如下: @@ -132,15 +132,15 @@ WITH BROKER "broker_name" ```text ( "hadoop.security.authentication" = "kerberos", - "kerberos_principal" = "doris@YOUR.COM", - "kerberos_keytab" = "/home/doris/my.keytab" + "hadoop.kerberos.principal" = "doris@YOUR.COM", + "hadoop.kerberos.keytab" = "/home/doris/my.keytab" ) ``` ```text ( "hadoop.security.authentication" = "kerberos", - "kerberos_principal" = "doris@YOUR.COM", + "hadoop.kerberos.principal" = "doris@YOUR.COM", "kerberos_keytab_content" = "ASDOWHDLAWIDJHWLDKSALDJSDIWALD" ) ``` @@ -174,6 +174,7 @@ WITH BROKER "broker_name" ```text ( + "fs.defaultFS" = "hdfs://my_ha", "dfs.nameservices" = "my_ha", "dfs.ha.namenodes.my_ha" = "my_namenode1, my_namenode2", "dfs.namenode.rpc-address.my_ha.my_namenode1" = "nn1_host:rpc_port", @@ -188,6 +189,7 @@ WITH BROKER "broker_name" ( "username"="user", "password"="passwd", + "fs.defaultFS" = "hdfs://my_ha", "dfs.nameservices" = "my_ha", "dfs.ha.namenodes.my_ha" = "my_namenode1, my_namenode2", "dfs.namenode.rpc-address.my_ha.my_namenode1" = "nn1_host:rpc_port", diff --git a/docs/zh-CN/docs/sql-manual/sql-reference/Data-Manipulation-Statements/Load/BROKER-LOAD.md b/docs/zh-CN/docs/sql-manual/sql-reference/Data-Manipulation-Statements/Load/BROKER-LOAD.md index 9e3ecc80ce..baea6beabc 100644 --- a/docs/zh-CN/docs/sql-manual/sql-reference/Data-Manipulation-Statements/Load/BROKER-LOAD.md +++ b/docs/zh-CN/docs/sql-manual/sql-reference/Data-Manipulation-Statements/Load/BROKER-LOAD.md @@ -268,6 +268,7 @@ WITH BROKER broker_name ( "username" = "", "password" = "", + "fs.defaultFS" = "hdfs://my_ha", "dfs.nameservices" = "my_ha", "dfs.ha.namenodes.my_ha" = "my_namenode1, my_namenode2", "dfs.namenode.rpc-address.my_ha.my_namenode1" = "nn1_host:rpc_port",