You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by pe...@apache.org on 2022/03/12 03:04:33 UTC
[pulsar] branch master updated: Follow-up modifications for ZK free (#14539)
This is an automated email from the ASF dual-hosted git repository.
penghui pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/pulsar.git
The following commit(s) were added to refs/heads/master by this push:
new 1e37fc2 Follow-up modifications for ZK free (#14539)
1e37fc2 is described below
commit 1e37fc2e43e1b6f73e491e4c26933e757a2a8316
Author: momo-jun <60...@users.noreply.github.com>
AuthorDate: Sat Mar 12 11:03:01 2022 +0800
Follow-up modifications for ZK free (#14539)
---
site2/docs/admin-api-clusters.md | 2 +-
site2/docs/concepts-architecture-overview.md | 2 +-
site2/docs/deploy-bare-metal-multi-cluster.md | 2 +-
site2/docs/deploy-bare-metal.md | 4 ++--
site2/docs/reference-cli-tools.md | 2 +-
site2/docs/reference-configuration.md | 5 ++++-
6 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/site2/docs/admin-api-clusters.md b/site2/docs/admin-api-clusters.md
index dd09f58..50ac20a 100644
--- a/site2/docs/admin-api-clusters.md
+++ b/site2/docs/admin-api-clusters.md
@@ -64,7 +64,7 @@ admin.clusters().createCluster(clusterName, clusterData);
When provision a new cluster, you need to initialize that cluster's [metadata](concepts-architecture-overview.md#metadata-store). When initializing cluster metadata, you need to specify all of the following:
* The name of the cluster
-* The local ZooKeeper connection string for the cluster
+* The local metadata store connection string for the cluster
* The configuration store connection string for the entire instance
* The web service URL for the cluster
* A broker service URL enabling interaction with the [brokers](reference-terminology.md#broker) in the cluster
diff --git a/site2/docs/concepts-architecture-overview.md b/site2/docs/concepts-architecture-overview.md
index b33e75a..14f81b8 100644
--- a/site2/docs/concepts-architecture-overview.md
+++ b/site2/docs/concepts-architecture-overview.md
@@ -125,7 +125,7 @@ The **Pulsar proxy** provides a solution to this problem by acting as a single g
> For the sake of performance and fault tolerance, you can run as many instances of the Pulsar proxy as you'd like.
-Architecturally, the Pulsar proxy gets all the information it requires from ZooKeeper. When starting the proxy on a machine, you only need to provide ZooKeeper connection strings for the cluster-specific and instance-wide configuration store clusters. Here's an example:
+Architecturally, the Pulsar proxy gets all the information it requires from ZooKeeper. When starting the proxy on a machine, you only need to provide metadata store connection strings for the cluster-specific and instance-wide configuration store clusters. Here's an example:
```bash
$ cd /path/to/pulsar/directory
diff --git a/site2/docs/deploy-bare-metal-multi-cluster.md b/site2/docs/deploy-bare-metal-multi-cluster.md
index 71eb174..d8e9fd9 100644
--- a/site2/docs/deploy-bare-metal-multi-cluster.md
+++ b/site2/docs/deploy-bare-metal-multi-cluster.md
@@ -212,7 +212,7 @@ $ bin/pulsar initialize-cluster-metadata \
As you can see from the example above, you need to specify the following:
* The name of the cluster
-* The local ZooKeeper connection string for the cluster
+* The local metadata store connection string for the cluster
* The configuration store connection string for the entire instance
* The web service URL for the cluster
* A broker service URL enabling interaction with the [brokers](reference-terminology.md#broker) in the cluster
diff --git a/site2/docs/deploy-bare-metal.md b/site2/docs/deploy-bare-metal.md
index 4f73cbb..a8d4961 100644
--- a/site2/docs/deploy-bare-metal.md
+++ b/site2/docs/deploy-bare-metal.md
@@ -254,8 +254,8 @@ As you can see from the example above, you will need to specify the following:
Flag | Description
:----|:-----------
`--cluster` | A name for the cluster
-`--zookeeper` | A "local" ZooKeeper connection string for the cluster. This connection string only needs to include *one* machine in the ZooKeeper cluster.
-`--configuration-store` | The configuration store connection string for the entire instance. As with the `--zookeeper` flag, this connection string only needs to include *one* machine in the ZooKeeper cluster.
+`--metadata-store` | A "local" metadata store connection string for the cluster. This connection string only needs to include *one* machine in the ZooKeeper cluster.
+`--configuration-metadata-store` | The configuration metadata store connection string for the entire instance. As with the `--metadata-store` flag, this connection string only needs to include *one* machine in the ZooKeeper cluster.
`--web-service-url` | The web service URL for the cluster, plus a port. This URL should be a standard DNS name. The default port is 8080 (you had better not use a different port).
`--web-service-url-tls` | If you use [TLS](security-tls-transport.md), you also need to specify a TLS web service URL for the cluster. The default port is 8443 (you had better not use a different port).
`--broker-service-url` | A broker service URL enabling interaction with the brokers in the cluster. This URL should not use the same DNS name as the web service URL but should use the `pulsar` scheme instead. The default port is 6650 (you had better not use a different port).
diff --git a/site2/docs/reference-cli-tools.md b/site2/docs/reference-cli-tools.md
index b53ec81..995ce7e 100644
--- a/site2/docs/reference-cli-tools.md
+++ b/site2/docs/reference-cli-tools.md
@@ -190,7 +190,7 @@ Options
|Flag|Description|Default|
|---|---|---|
-|`-cms`, `--configuration-metadata-store`|Configuration meta store connection string||
+|`-cms`, `--configuration-metadata-store`|Configuration metadata store connection string||
|`-md` , `--metadata-store`|Metadata Store service url||
Example
diff --git a/site2/docs/reference-configuration.md b/site2/docs/reference-configuration.md
index 9e4dfc0..4c34007 100644
--- a/site2/docs/reference-configuration.md
+++ b/site2/docs/reference-configuration.md
@@ -716,6 +716,8 @@ The following parameters have been deprecated in the `conf/standalone.conf` file
|Name|Description|Default|
|---|---|---|
+|zookeeperServers| The quorum connection string for local metadata store. Use `metadataStoreUrl` instead. |N/A|
+|configurationStoreServers| Configuration store connection string (as a comma-separated list). Use `configurationMetadataStoreUrl` instead. |N/A|
|zooKeeperOperationTimeoutSeconds|ZooKeeper operation timeout in seconds. Use `metadataStoreOperationTimeoutSeconds` instead. |30|
|zooKeeperCacheExpirySeconds|ZooKeeper cache expiry time in seconds. Use `metadataStoreCacheExpirySeconds` instead. |300|
|zooKeeperSessionTimeoutMillis| The ZooKeeper session timeout, in milliseconds. Use `metadataStoreSessionTimeoutMillis` instead. |30000|
@@ -724,7 +726,7 @@ The following parameters have been deprecated in the `conf/standalone.conf` file
|Name|Description|Default|
|---|---|---|
-|configurationMetadataStoreUrl |||
+|configurationMetadataStoreUrl |Configuration store connection string. |N/A|
|metadataStoreSessionTimeoutMillis|Metadata store session timeout in milliseconds. |30000|
|metadataStoreCacheExpirySeconds|Metadata store cache expiry time in seconds|300|
|serviceUrl|||
@@ -754,6 +756,7 @@ The following parameters have been deprecated in the `conf/websocket.conf` file.
|---|---|---|
|zooKeeperSessionTimeoutMillis|The ZooKeeper session timeout in milliseconds. Use `metadataStoreSessionTimeoutMillis` instead. |30000|
|zooKeeperCacheExpirySeconds|ZooKeeper cache expiry time in seconds. Use `metadataStoreCacheExpirySeconds` instead.|300|
+|configurationStoreServers| Configuration Store connection string. Use `configurationMetadataStoreUrl` instead.|N/A|
## Pulsar proxy