This is an automated email from the ASF dual-hosted git repository.
bogong pushed a commit to branch branch-2.9
in repository https://gitbox.apache.org/repos/asf/pulsar.git
The following commit(s) were added to refs/heads/branch-2.9 by this push:
new 3a936bc90d5 cherry-pick 4721ce1
3a936bc90d5 is described below
commit 3a936bc90d5031a76feefec3f45645e7dfbf0dc6
Author: Qiang Huang <[email protected]>
AuthorDate: Tue Apr 12 16:29:24 2022 +0800
cherry-pick 4721ce1
---
bin/function-localrunner | 2 +-
conf/bkenv.sh | 2 +-
conf/pulsar_env.sh | 2 +-
deployment/terraform-ansible/templates/pulsar_env.sh | 2 +-
site2/docs/cookbooks-tiered-storage.md | 2 +-
site2/docs/tiered-storage-aws.md | 2 +-
.../version-2.1.0-incubating/cookbooks-tiered-storage.md | 2 +-
.../version-2.1.1-incubating/cookbooks-tiered-storage.md | 2 +-
.../version-2.2.0/cookbooks-tiered-storage.md | 2 +-
.../version-2.4.0/cookbooks-tiered-storage.md | 2 +-
.../version-2.5.0/cookbooks-tiered-storage.md | 2 +-
.../version-2.6.0/cookbooks-tiered-storage.md | 2 +-
.../version-2.6.1/cookbooks-tiered-storage.md | 2 +-
.../version-2.6.2/cookbooks-tiered-storage.md | 2 +-
.../version-2.6.3/cookbooks-tiered-storage.md | 2 +-
.../version-2.6.4/cookbooks-tiered-storage.md | 2 +-
.../version-2.7.0/cookbooks-tiered-storage.md | 2 +-
.../versioned_docs/version-2.7.0/tiered-storage-aws.md | 2 +-
.../version-2.7.1/cookbooks-tiered-storage.md | 2 +-
.../versioned_docs/version-2.7.1/tiered-storage-aws.md | 2 +-
.../version-2.7.2/cookbooks-tiered-storage.md | 2 +-
.../versioned_docs/version-2.7.2/tiered-storage-aws.md | 2 +-
.../version-2.7.3/cookbooks-tiered-storage.md | 2 +-
.../versioned_docs/version-2.7.3/tiered-storage-aws.md | 2 +-
.../cookbooks-tiered-storage.md | 14 +++++---------
.../{version-2.7.3 => version-2.7.4}/tiered-storage-aws.md | 8 +++-----
.../version-2.8.0/cookbooks-tiered-storage.md | 2 +-
.../versioned_docs/version-2.8.0/tiered-storage-aws.md | 2 +-
.../version-2.8.1/cookbooks-tiered-storage.md | 2 +-
.../versioned_docs/version-2.8.1/tiered-storage-aws.md | 2 +-
.../version-2.8.2/cookbooks-tiered-storage.md | 2 +-
.../versioned_docs/version-2.8.2/tiered-storage-aws.md | 2 +-
.../cookbooks-tiered-storage.md | 4 ++--
.../versioned_docs/version-2.9.0}/tiered-storage-aws.md | 7 +++----
.../cookbooks-tiered-storage.md | 4 ++--
.../versioned_docs/version-2.9.1}/tiered-storage-aws.md | 7 +++----
36 files changed, 48 insertions(+), 56 deletions(-)
diff --git a/bin/function-localrunner b/bin/function-localrunner
index a1f81c43b44..19134f4973b 100755
--- a/bin/function-localrunner
+++ b/bin/function-localrunner
@@ -39,7 +39,7 @@ else
fi
# Extra options to be passed to the jvm
-PULSAR_EXTRA_OPTS=${PULSAR_EXTRA_OPTS:-" -Dpulsar.allocator.exit_on_oom=true
-Dio.netty.recycler.maxCapacity.default=1000
-Dio.netty.recycler.linkCapacity=1024"}
+PULSAR_EXTRA_OPTS=${PULSAR_EXTRA_OPTS:-" -Dpulsar.allocator.exit_on_oom=true
-Dio.netty.recycler.maxCapacityPerThread=4096"}
# Check for the java to use
if [[ -z $JAVA_HOME ]]; then
diff --git a/conf/bkenv.sh b/conf/bkenv.sh
index 5215fdeceed..af2712ed10c 100644
--- a/conf/bkenv.sh
+++ b/conf/bkenv.sh
@@ -39,7 +39,7 @@ BOOKIE_MEM=${BOOKIE_MEM:-${PULSAR_MEM:-"-Xms2g -Xmx2g
-XX:MaxDirectMemorySize=2g
BOOKIE_GC=${BOOKIE_GC:-${PULSAR_GC:-"-XX:+UseG1GC -XX:MaxGCPauseMillis=10
-XX:+ParallelRefProcEnabled -XX:+UnlockExperimentalVMOptions
-XX:+DoEscapeAnalysis -XX:ParallelGCThreads=32 -XX:ConcGCThreads=32
-XX:G1NewSizePercent=50 -XX:+DisableExplicitGC -XX:-ResizePLAB"}}
# Extra options to be passed to the jvm
-BOOKIE_EXTRA_OPTS="${BOOKIE_EXTRA_OPTS:-"-Dio.netty.leakDetectionLevel=disabled
${PULSAR_EXTRA_OPTS:-"-Dio.netty.recycler.maxCapacity.default=1000
-Dio.netty.recycler.linkCapacity=1024"}"} ${BOOKIE_MEM} ${BOOKIE_GC}"
+BOOKIE_EXTRA_OPTS="${BOOKIE_EXTRA_OPTS:-"-Dio.netty.leakDetectionLevel=disabled
${PULSAR_EXTRA_OPTS:-"-Dio.netty.recycler.maxCapacityPerThread=4096"}"}"
# Add extra paths to the bookkeeper classpath
# BOOKIE_EXTRA_CLASSPATH=
diff --git a/conf/pulsar_env.sh b/conf/pulsar_env.sh
index 61201dd835c..4b2cd17e4fd 100755
--- a/conf/pulsar_env.sh
+++ b/conf/pulsar_env.sh
@@ -58,7 +58,7 @@ else
fi
# Extra options to be passed to the jvm
-PULSAR_EXTRA_OPTS=${PULSAR_EXTRA_OPTS:-" -Dpulsar.allocator.exit_on_oom=true
-Dio.netty.recycler.maxCapacity.default=1000
-Dio.netty.recycler.linkCapacity=1024"}
+PULSAR_EXTRA_OPTS="${PULSAR_EXTRA_OPTS:-" -Dpulsar.allocator.exit_on_oom=true
-Dio.netty.recycler.maxCapacityPerThread=4096"}"
# Add extra paths to the bookkeeper classpath
# PULSAR_EXTRA_CLASSPATH=
diff --git a/deployment/terraform-ansible/templates/pulsar_env.sh
b/deployment/terraform-ansible/templates/pulsar_env.sh
index 1f0dc0d9990..72ad860c308 100644
--- a/deployment/terraform-ansible/templates/pulsar_env.sh
+++ b/deployment/terraform-ansible/templates/pulsar_env.sh
@@ -48,7 +48,7 @@ PULSAR_MEM=" -Xms{{ max_heap_memory }} -Xmx{{ max_heap_memory
}} -XX:MaxDirectMe
PULSAR_GC=" -XX:+UseG1GC -XX:MaxGCPauseMillis=10 -XX:+ParallelRefProcEnabled
-XX:+UnlockExperimentalVMOptions -XX:+DoEscapeAnalysis -XX:ParallelGCThreads=32
-XX:ConcGCThreads=32 -XX:G1NewSizePercent=50 -XX:+DisableExplicitGC
-XX:-ResizePLAB"
# Extra options to be passed to the jvm
-PULSAR_EXTRA_OPTS="${PULSAR_EXTRA_OPTS} ${PULSAR_MEM} ${PULSAR_GC}
-Dio.netty.leakDetectionLevel=disabled
-Dio.netty.recycler.maxCapacity.default=1000
-Dio.netty.recycler.linkCapacity=1024"
+PULSAR_EXTRA_OPTS="${PULSAR_EXTRA_OPTS} ${PULSAR_MEM} ${PULSAR_GC}
-Dio.netty.leakDetectionLevel=disabled
-Dio.netty.recycler.maxCapacityPerThread=4096"
# Add extra paths to the bookkeeper classpath
# PULSAR_EXTRA_CLASSPATH=
diff --git a/site2/docs/cookbooks-tiered-storage.md
b/site2/docs/cookbooks-tiered-storage.md
index 0263ec25962..ef81625df99 100644
--- a/site2/docs/cookbooks-tiered-storage.md
+++ b/site2/docs/cookbooks-tiered-storage.md
@@ -106,7 +106,7 @@ export
AWS_SECRET_ACCESS_KEY=ded7db27a4558e2ea8bbf0bf37ae0e8521618f366c
3. Add the Java system properties *aws.accessKeyId* and *aws.secretKey* to
**PULSAR_EXTRA_OPTS** in `conf/pulsar_env.sh`.
```bash
-PULSAR_EXTRA_OPTS="${PULSAR_EXTRA_OPTS} ${PULSAR_MEM} ${PULSAR_GC}
-Daws.accessKeyId=ABC123456789
-Daws.secretKey=ded7db27a4558e2ea8bbf0bf37ae0e8521618f366c
-Dio.netty.leakDetectionLevel=disabled
-Dio.netty.recycler.maxCapacity.default=1000
-Dio.netty.recycler.linkCapacity=1024"
+PULSAR_EXTRA_OPTS="${PULSAR_EXTRA_OPTS} ${PULSAR_MEM} ${PULSAR_GC}
-Daws.accessKeyId=ABC123456789
-Daws.secretKey=ded7db27a4558e2ea8bbf0bf37ae0e8521618f366c
-Dio.netty.leakDetectionLevel=disabled
-Dio.netty.recycler.maxCapacityPerThread=4096"
```
4. Set the access credentials in ```~/.aws/credentials```.
diff --git a/site2/docs/tiered-storage-aws.md b/site2/docs/tiered-storage-aws.md
index 2c3915a3375..39484ffced5 100644
--- a/site2/docs/tiered-storage-aws.md
+++ b/site2/docs/tiered-storage-aws.md
@@ -145,7 +145,7 @@ Once you have created a set of credentials in the AWS IAM
console, you can confi
* Add the Java system properties `aws.accessKeyId` and `aws.secretKey` to
`PULSAR_EXTRA_OPTS` in `conf/pulsar_env.sh`.
```bash
- PULSAR_EXTRA_OPTS="${PULSAR_EXTRA_OPTS} ${PULSAR_MEM} ${PULSAR_GC}
-Daws.accessKeyId=ABC123456789
-Daws.secretKey=ded7db27a4558e2ea8bbf0bf37ae0e8521618f366c
-Dio.netty.leakDetectionLevel=disabled
-Dio.netty.recycler.maxCapacity.default=1000
-Dio.netty.recycler.linkCapacity=1024"
+ PULSAR_EXTRA_OPTS="${PULSAR_EXTRA_OPTS} ${PULSAR_MEM} ${PULSAR_GC}
-Daws.accessKeyId=ABC123456789
-Daws.secretKey=ded7db27a4558e2ea8bbf0bf37ae0e8521618f366c
-Dio.netty.leakDetectionLevel=disabled
-Dio.netty.recycler.maxCapacityPerThread=4096"
```
* Set the access credentials in `~/.aws/credentials`.
diff --git
a/site2/website/versioned_docs/version-2.1.0-incubating/cookbooks-tiered-storage.md
b/site2/website/versioned_docs/version-2.1.0-incubating/cookbooks-tiered-storage.md
index d852d7b8b71..0114c3d7ec7 100644
---
a/site2/website/versioned_docs/version-2.1.0-incubating/cookbooks-tiered-storage.md
+++
b/site2/website/versioned_docs/version-2.1.0-incubating/cookbooks-tiered-storage.md
@@ -73,7 +73,7 @@ export
AWS_SECRET_ACCESS_KEY=ded7db27a4558e2ea8bbf0bf37ae0e8521618f366c
2. Add the Java system properties *aws.accessKeyId* and *aws.secretKey* to
**PULSAR_EXTRA_OPTS** in `conf/pulsar_env.sh`.
```bash
-PULSAR_EXTRA_OPTS="${PULSAR_EXTRA_OPTS} ${PULSAR_MEM} ${PULSAR_GC}
-Daws.accessKeyId=ABC123456789
-Daws.secretKey=ded7db27a4558e2ea8bbf0bf37ae0e8521618f366c
-Dio.netty.leakDetectionLevel=disabled
-Dio.netty.recycler.maxCapacity.default=1000
-Dio.netty.recycler.linkCapacity=1024"
+PULSAR_EXTRA_OPTS="${PULSAR_EXTRA_OPTS} ${PULSAR_MEM} ${PULSAR_GC}
-Daws.accessKeyId=ABC123456789
-Daws.secretKey=ded7db27a4558e2ea8bbf0bf37ae0e8521618f366c
-Dio.netty.leakDetectionLevel=disabled
-Dio.netty.recycler.maxCapacityPerThread=4096"
```
3. Set the access credentials in ```~/.aws/credentials```.
diff --git
a/site2/website/versioned_docs/version-2.1.1-incubating/cookbooks-tiered-storage.md
b/site2/website/versioned_docs/version-2.1.1-incubating/cookbooks-tiered-storage.md
index 24b6beaf134..b876a6d0cb2 100644
---
a/site2/website/versioned_docs/version-2.1.1-incubating/cookbooks-tiered-storage.md
+++
b/site2/website/versioned_docs/version-2.1.1-incubating/cookbooks-tiered-storage.md
@@ -73,7 +73,7 @@ export
AWS_SECRET_ACCESS_KEY=ded7db27a4558e2ea8bbf0bf37ae0e8521618f366c
2. Add the Java system properties *aws.accessKeyId* and *aws.secretKey* to
**PULSAR_EXTRA_OPTS** in `conf/pulsar_env.sh`.
```bash
-PULSAR_EXTRA_OPTS="${PULSAR_EXTRA_OPTS} ${PULSAR_MEM} ${PULSAR_GC}
-Daws.accessKeyId=ABC123456789
-Daws.secretKey=ded7db27a4558e2ea8bbf0bf37ae0e8521618f366c
-Dio.netty.leakDetectionLevel=disabled
-Dio.netty.recycler.maxCapacity.default=1000
-Dio.netty.recycler.linkCapacity=1024"
+PULSAR_EXTRA_OPTS="${PULSAR_EXTRA_OPTS} ${PULSAR_MEM} ${PULSAR_GC}
-Daws.accessKeyId=ABC123456789
-Daws.secretKey=ded7db27a4558e2ea8bbf0bf37ae0e8521618f366c
-Dio.netty.leakDetectionLevel=disabled
-Dio.netty.recycler.maxCapacityPerThread=4096"
```
3. Set the access credentials in ```~/.aws/credentials```.
diff --git
a/site2/website/versioned_docs/version-2.2.0/cookbooks-tiered-storage.md
b/site2/website/versioned_docs/version-2.2.0/cookbooks-tiered-storage.md
index 406d56452eb..94a0cb95ba7 100644
--- a/site2/website/versioned_docs/version-2.2.0/cookbooks-tiered-storage.md
+++ b/site2/website/versioned_docs/version-2.2.0/cookbooks-tiered-storage.md
@@ -96,7 +96,7 @@ export
AWS_SECRET_ACCESS_KEY=ded7db27a4558e2ea8bbf0bf37ae0e8521618f366c
2. Add the Java system properties *aws.accessKeyId* and *aws.secretKey* to
**PULSAR_EXTRA_OPTS** in `conf/pulsar_env.sh`.
```bash
-PULSAR_EXTRA_OPTS="${PULSAR_EXTRA_OPTS} ${PULSAR_MEM} ${PULSAR_GC}
-Daws.accessKeyId=ABC123456789
-Daws.secretKey=ded7db27a4558e2ea8bbf0bf37ae0e8521618f366c
-Dio.netty.leakDetectionLevel=disabled
-Dio.netty.recycler.maxCapacity.default=1000
-Dio.netty.recycler.linkCapacity=1024"
+PULSAR_EXTRA_OPTS="${PULSAR_EXTRA_OPTS} ${PULSAR_MEM} ${PULSAR_GC}
-Daws.accessKeyId=ABC123456789
-Daws.secretKey=ded7db27a4558e2ea8bbf0bf37ae0e8521618f366c
-Dio.netty.leakDetectionLevel=disabled
-Dio.netty.recycler.maxCapacityPerThread=4096"
```
3. Set the access credentials in ```~/.aws/credentials```.
diff --git
a/site2/website/versioned_docs/version-2.4.0/cookbooks-tiered-storage.md
b/site2/website/versioned_docs/version-2.4.0/cookbooks-tiered-storage.md
index 4d255512362..2684ddd4686 100644
--- a/site2/website/versioned_docs/version-2.4.0/cookbooks-tiered-storage.md
+++ b/site2/website/versioned_docs/version-2.4.0/cookbooks-tiered-storage.md
@@ -103,7 +103,7 @@ export
AWS_SECRET_ACCESS_KEY=ded7db27a4558e2ea8bbf0bf37ae0e8521618f366c
3. Add the Java system properties *aws.accessKeyId* and *aws.secretKey* to
**PULSAR_EXTRA_OPTS** in `conf/pulsar_env.sh`.
```bash
-PULSAR_EXTRA_OPTS="${PULSAR_EXTRA_OPTS} ${PULSAR_MEM} ${PULSAR_GC}
-Daws.accessKeyId=ABC123456789
-Daws.secretKey=ded7db27a4558e2ea8bbf0bf37ae0e8521618f366c
-Dio.netty.leakDetectionLevel=disabled
-Dio.netty.recycler.maxCapacity.default=1000
-Dio.netty.recycler.linkCapacity=1024"
+PULSAR_EXTRA_OPTS="${PULSAR_EXTRA_OPTS} ${PULSAR_MEM} ${PULSAR_GC}
-Daws.accessKeyId=ABC123456789
-Daws.secretKey=ded7db27a4558e2ea8bbf0bf37ae0e8521618f366c
-Dio.netty.leakDetectionLevel=disabled
-Dio.netty.recycler.maxCapacityPerThread=4096"
```
4. Set the access credentials in ```~/.aws/credentials```.
diff --git
a/site2/website/versioned_docs/version-2.5.0/cookbooks-tiered-storage.md
b/site2/website/versioned_docs/version-2.5.0/cookbooks-tiered-storage.md
index d1707f50ddd..9f3367eebc7 100644
--- a/site2/website/versioned_docs/version-2.5.0/cookbooks-tiered-storage.md
+++ b/site2/website/versioned_docs/version-2.5.0/cookbooks-tiered-storage.md
@@ -107,7 +107,7 @@ export
AWS_SECRET_ACCESS_KEY=ded7db27a4558e2ea8bbf0bf37ae0e8521618f366c
3. Add the Java system properties *aws.accessKeyId* and *aws.secretKey* to
**PULSAR_EXTRA_OPTS** in `conf/pulsar_env.sh`.
```bash
-PULSAR_EXTRA_OPTS="${PULSAR_EXTRA_OPTS} ${PULSAR_MEM} ${PULSAR_GC}
-Daws.accessKeyId=ABC123456789
-Daws.secretKey=ded7db27a4558e2ea8bbf0bf37ae0e8521618f366c
-Dio.netty.leakDetectionLevel=disabled
-Dio.netty.recycler.maxCapacity.default=1000
-Dio.netty.recycler.linkCapacity=1024"
+PULSAR_EXTRA_OPTS="${PULSAR_EXTRA_OPTS} ${PULSAR_MEM} ${PULSAR_GC}
-Daws.accessKeyId=ABC123456789
-Daws.secretKey=ded7db27a4558e2ea8bbf0bf37ae0e8521618f366c
-Dio.netty.leakDetectionLevel=disabled
-Dio.netty.recycler.maxCapacityPerThread=4096"
```
4. Set the access credentials in ```~/.aws/credentials```.
diff --git
a/site2/website/versioned_docs/version-2.6.0/cookbooks-tiered-storage.md
b/site2/website/versioned_docs/version-2.6.0/cookbooks-tiered-storage.md
index a631f18042c..23b895d0d22 100644
--- a/site2/website/versioned_docs/version-2.6.0/cookbooks-tiered-storage.md
+++ b/site2/website/versioned_docs/version-2.6.0/cookbooks-tiered-storage.md
@@ -107,7 +107,7 @@ export
AWS_SECRET_ACCESS_KEY=ded7db27a4558e2ea8bbf0bf37ae0e8521618f366c
3. Add the Java system properties *aws.accessKeyId* and *aws.secretKey* to
**PULSAR_EXTRA_OPTS** in `conf/pulsar_env.sh`.
```bash
-PULSAR_EXTRA_OPTS="${PULSAR_EXTRA_OPTS} ${PULSAR_MEM} ${PULSAR_GC}
-Daws.accessKeyId=ABC123456789
-Daws.secretKey=ded7db27a4558e2ea8bbf0bf37ae0e8521618f366c
-Dio.netty.leakDetectionLevel=disabled
-Dio.netty.recycler.maxCapacity.default=1000
-Dio.netty.recycler.linkCapacity=1024"
+PULSAR_EXTRA_OPTS="${PULSAR_EXTRA_OPTS} ${PULSAR_MEM} ${PULSAR_GC}
-Daws.accessKeyId=ABC123456789
-Daws.secretKey=ded7db27a4558e2ea8bbf0bf37ae0e8521618f366c
-Dio.netty.leakDetectionLevel=disabled
-Dio.netty.recycler.maxCapacityPerThread=4096"
```
4. Set the access credentials in ```~/.aws/credentials```.
diff --git
a/site2/website/versioned_docs/version-2.6.1/cookbooks-tiered-storage.md
b/site2/website/versioned_docs/version-2.6.1/cookbooks-tiered-storage.md
index 67331cd09e2..cc6c65d3ebb 100644
--- a/site2/website/versioned_docs/version-2.6.1/cookbooks-tiered-storage.md
+++ b/site2/website/versioned_docs/version-2.6.1/cookbooks-tiered-storage.md
@@ -105,7 +105,7 @@ export
AWS_SECRET_ACCESS_KEY=ded7db27a4558e2ea8bbf0bf37ae0e8521618f366c
3. Add the Java system properties *aws.accessKeyId* and *aws.secretKey* to
**PULSAR_EXTRA_OPTS** in `conf/pulsar_env.sh`.
```bash
-PULSAR_EXTRA_OPTS="${PULSAR_EXTRA_OPTS} ${PULSAR_MEM} ${PULSAR_GC}
-Daws.accessKeyId=ABC123456789
-Daws.secretKey=ded7db27a4558e2ea8bbf0bf37ae0e8521618f366c
-Dio.netty.leakDetectionLevel=disabled
-Dio.netty.recycler.maxCapacity.default=1000
-Dio.netty.recycler.linkCapacity=1024"
+PULSAR_EXTRA_OPTS="${PULSAR_EXTRA_OPTS} ${PULSAR_MEM} ${PULSAR_GC}
-Daws.accessKeyId=ABC123456789
-Daws.secretKey=ded7db27a4558e2ea8bbf0bf37ae0e8521618f366c
-Dio.netty.leakDetectionLevel=disabled
-Dio.netty.recycler.maxCapacityPerThread=4096"
```
4. Set the access credentials in ```~/.aws/credentials```.
diff --git
a/site2/website/versioned_docs/version-2.6.2/cookbooks-tiered-storage.md
b/site2/website/versioned_docs/version-2.6.2/cookbooks-tiered-storage.md
index 5e83af30e96..0e4cf2b059e 100644
--- a/site2/website/versioned_docs/version-2.6.2/cookbooks-tiered-storage.md
+++ b/site2/website/versioned_docs/version-2.6.2/cookbooks-tiered-storage.md
@@ -105,7 +105,7 @@ export
AWS_SECRET_ACCESS_KEY=ded7db27a4558e2ea8bbf0bf37ae0e8521618f366c
3. Add the Java system properties *aws.accessKeyId* and *aws.secretKey* to
**PULSAR_EXTRA_OPTS** in `conf/pulsar_env.sh`.
```bash
-PULSAR_EXTRA_OPTS="${PULSAR_EXTRA_OPTS} ${PULSAR_MEM} ${PULSAR_GC}
-Daws.accessKeyId=ABC123456789
-Daws.secretKey=ded7db27a4558e2ea8bbf0bf37ae0e8521618f366c
-Dio.netty.leakDetectionLevel=disabled
-Dio.netty.recycler.maxCapacity.default=1000
-Dio.netty.recycler.linkCapacity=1024"
+PULSAR_EXTRA_OPTS="${PULSAR_EXTRA_OPTS} ${PULSAR_MEM} ${PULSAR_GC}
-Daws.accessKeyId=ABC123456789
-Daws.secretKey=ded7db27a4558e2ea8bbf0bf37ae0e8521618f366c
-Dio.netty.leakDetectionLevel=disabled
-Dio.netty.recycler.maxCapacityPerThread=4096"
```
4. Set the access credentials in ```~/.aws/credentials```.
diff --git
a/site2/website/versioned_docs/version-2.6.3/cookbooks-tiered-storage.md
b/site2/website/versioned_docs/version-2.6.3/cookbooks-tiered-storage.md
index 43efc69f1a3..d0661584e3e 100644
--- a/site2/website/versioned_docs/version-2.6.3/cookbooks-tiered-storage.md
+++ b/site2/website/versioned_docs/version-2.6.3/cookbooks-tiered-storage.md
@@ -105,7 +105,7 @@ export
AWS_SECRET_ACCESS_KEY=ded7db27a4558e2ea8bbf0bf37ae0e8521618f366c
3. Add the Java system properties *aws.accessKeyId* and *aws.secretKey* to
**PULSAR_EXTRA_OPTS** in `conf/pulsar_env.sh`.
```bash
-PULSAR_EXTRA_OPTS="${PULSAR_EXTRA_OPTS} ${PULSAR_MEM} ${PULSAR_GC}
-Daws.accessKeyId=ABC123456789
-Daws.secretKey=ded7db27a4558e2ea8bbf0bf37ae0e8521618f366c
-Dio.netty.leakDetectionLevel=disabled
-Dio.netty.recycler.maxCapacity.default=1000
-Dio.netty.recycler.linkCapacity=1024"
+PULSAR_EXTRA_OPTS="${PULSAR_EXTRA_OPTS} ${PULSAR_MEM} ${PULSAR_GC}
-Daws.accessKeyId=ABC123456789
-Daws.secretKey=ded7db27a4558e2ea8bbf0bf37ae0e8521618f366c
-Dio.netty.leakDetectionLevel=disabled
-Dio.netty.recycler.maxCapacityPerThread=4096"
```
4. Set the access credentials in ```~/.aws/credentials```.
diff --git
a/site2/website/versioned_docs/version-2.6.4/cookbooks-tiered-storage.md
b/site2/website/versioned_docs/version-2.6.4/cookbooks-tiered-storage.md
index e5bb8751061..b587eb1b7e0 100644
--- a/site2/website/versioned_docs/version-2.6.4/cookbooks-tiered-storage.md
+++ b/site2/website/versioned_docs/version-2.6.4/cookbooks-tiered-storage.md
@@ -105,7 +105,7 @@ export
AWS_SECRET_ACCESS_KEY=ded7db27a4558e2ea8bbf0bf37ae0e8521618f366c
3. Add the Java system properties *aws.accessKeyId* and *aws.secretKey* to
**PULSAR_EXTRA_OPTS** in `conf/pulsar_env.sh`.
```bash
-PULSAR_EXTRA_OPTS="${PULSAR_EXTRA_OPTS} ${PULSAR_MEM} ${PULSAR_GC}
-Daws.accessKeyId=ABC123456789
-Daws.secretKey=ded7db27a4558e2ea8bbf0bf37ae0e8521618f366c
-Dio.netty.leakDetectionLevel=disabled
-Dio.netty.recycler.maxCapacity.default=1000
-Dio.netty.recycler.linkCapacity=1024"
+PULSAR_EXTRA_OPTS="${PULSAR_EXTRA_OPTS} ${PULSAR_MEM} ${PULSAR_GC}
-Daws.accessKeyId=ABC123456789
-Daws.secretKey=ded7db27a4558e2ea8bbf0bf37ae0e8521618f366c
-Dio.netty.leakDetectionLevel=disabled
-Dio.netty.recycler.maxCapacityPerThread=4096"
```
4. Set the access credentials in ```~/.aws/credentials```.
diff --git
a/site2/website/versioned_docs/version-2.7.0/cookbooks-tiered-storage.md
b/site2/website/versioned_docs/version-2.7.0/cookbooks-tiered-storage.md
index 3d63f20c782..43b2f7f35e2 100644
--- a/site2/website/versioned_docs/version-2.7.0/cookbooks-tiered-storage.md
+++ b/site2/website/versioned_docs/version-2.7.0/cookbooks-tiered-storage.md
@@ -107,7 +107,7 @@ export
AWS_SECRET_ACCESS_KEY=ded7db27a4558e2ea8bbf0bf37ae0e8521618f366c
3. Add the Java system properties *aws.accessKeyId* and *aws.secretKey* to
**PULSAR_EXTRA_OPTS** in `conf/pulsar_env.sh`.
```bash
-PULSAR_EXTRA_OPTS="${PULSAR_EXTRA_OPTS} ${PULSAR_MEM} ${PULSAR_GC}
-Daws.accessKeyId=ABC123456789
-Daws.secretKey=ded7db27a4558e2ea8bbf0bf37ae0e8521618f366c
-Dio.netty.leakDetectionLevel=disabled
-Dio.netty.recycler.maxCapacity.default=1000
-Dio.netty.recycler.linkCapacity=1024"
+PULSAR_EXTRA_OPTS="${PULSAR_EXTRA_OPTS} ${PULSAR_MEM} ${PULSAR_GC}
-Daws.accessKeyId=ABC123456789
-Daws.secretKey=ded7db27a4558e2ea8bbf0bf37ae0e8521618f366c
-Dio.netty.leakDetectionLevel=disabled
-Dio.netty.recycler.maxCapacityPerThread=4096"
```
4. Set the access credentials in ```~/.aws/credentials```.
diff --git a/site2/website/versioned_docs/version-2.7.0/tiered-storage-aws.md
b/site2/website/versioned_docs/version-2.7.0/tiered-storage-aws.md
index 20c25c6c962..afffc713827 100644
--- a/site2/website/versioned_docs/version-2.7.0/tiered-storage-aws.md
+++ b/site2/website/versioned_docs/version-2.7.0/tiered-storage-aws.md
@@ -146,7 +146,7 @@ Once you have created a set of credentials in the AWS IAM
console, you can confi
* Add the Java system properties `aws.accessKeyId` and `aws.secretKey` to
`PULSAR_EXTRA_OPTS` in `conf/pulsar_env.sh`.
```bash
- PULSAR_EXTRA_OPTS="${PULSAR_EXTRA_OPTS} ${PULSAR_MEM} ${PULSAR_GC}
-Daws.accessKeyId=ABC123456789
-Daws.secretKey=ded7db27a4558e2ea8bbf0bf37ae0e8521618f366c
-Dio.netty.leakDetectionLevel=disabled
-Dio.netty.recycler.maxCapacity.default=1000
-Dio.netty.recycler.linkCapacity=1024"
+ PULSAR_EXTRA_OPTS="${PULSAR_EXTRA_OPTS} ${PULSAR_MEM} ${PULSAR_GC}
-Daws.accessKeyId=ABC123456789
-Daws.secretKey=ded7db27a4558e2ea8bbf0bf37ae0e8521618f366c
-Dio.netty.leakDetectionLevel=disabled
-Dio.netty.recycler.maxCapacityPerThread=4096"
```
* Set the access credentials in `~/.aws/credentials`.
diff --git
a/site2/website/versioned_docs/version-2.7.1/cookbooks-tiered-storage.md
b/site2/website/versioned_docs/version-2.7.1/cookbooks-tiered-storage.md
index ebcbc6caf97..a84dc366a8f 100644
--- a/site2/website/versioned_docs/version-2.7.1/cookbooks-tiered-storage.md
+++ b/site2/website/versioned_docs/version-2.7.1/cookbooks-tiered-storage.md
@@ -107,7 +107,7 @@ export
AWS_SECRET_ACCESS_KEY=ded7db27a4558e2ea8bbf0bf37ae0e8521618f366c
3. Add the Java system properties *aws.accessKeyId* and *aws.secretKey* to
**PULSAR_EXTRA_OPTS** in `conf/pulsar_env.sh`.
```bash
-PULSAR_EXTRA_OPTS="${PULSAR_EXTRA_OPTS} ${PULSAR_MEM} ${PULSAR_GC}
-Daws.accessKeyId=ABC123456789
-Daws.secretKey=ded7db27a4558e2ea8bbf0bf37ae0e8521618f366c
-Dio.netty.leakDetectionLevel=disabled
-Dio.netty.recycler.maxCapacity.default=1000
-Dio.netty.recycler.linkCapacity=1024"
+PULSAR_EXTRA_OPTS="${PULSAR_EXTRA_OPTS} ${PULSAR_MEM} ${PULSAR_GC}
-Daws.accessKeyId=ABC123456789
-Daws.secretKey=ded7db27a4558e2ea8bbf0bf37ae0e8521618f366c
-Dio.netty.leakDetectionLevel=disabled
-Dio.netty.recycler.maxCapacityPerThread=4096"
```
4. Set the access credentials in ```~/.aws/credentials```.
diff --git a/site2/website/versioned_docs/version-2.7.1/tiered-storage-aws.md
b/site2/website/versioned_docs/version-2.7.1/tiered-storage-aws.md
index 76b0fa499f8..315f6bac3a6 100644
--- a/site2/website/versioned_docs/version-2.7.1/tiered-storage-aws.md
+++ b/site2/website/versioned_docs/version-2.7.1/tiered-storage-aws.md
@@ -146,7 +146,7 @@ Once you have created a set of credentials in the AWS IAM
console, you can confi
* Add the Java system properties `aws.accessKeyId` and `aws.secretKey` to
`PULSAR_EXTRA_OPTS` in `conf/pulsar_env.sh`.
```bash
- PULSAR_EXTRA_OPTS="${PULSAR_EXTRA_OPTS} ${PULSAR_MEM} ${PULSAR_GC}
-Daws.accessKeyId=ABC123456789
-Daws.secretKey=ded7db27a4558e2ea8bbf0bf37ae0e8521618f366c
-Dio.netty.leakDetectionLevel=disabled
-Dio.netty.recycler.maxCapacity.default=1000
-Dio.netty.recycler.linkCapacity=1024"
+ PULSAR_EXTRA_OPTS="${PULSAR_EXTRA_OPTS} ${PULSAR_MEM} ${PULSAR_GC}
-Daws.accessKeyId=ABC123456789
-Daws.secretKey=ded7db27a4558e2ea8bbf0bf37ae0e8521618f366c
-Dio.netty.leakDetectionLevel=disabled
-Dio.netty.recycler.maxCapacityPerThread=4096"
```
* Set the access credentials in `~/.aws/credentials`.
diff --git
a/site2/website/versioned_docs/version-2.7.2/cookbooks-tiered-storage.md
b/site2/website/versioned_docs/version-2.7.2/cookbooks-tiered-storage.md
index adffcf6fe4f..08193e29f95 100644
--- a/site2/website/versioned_docs/version-2.7.2/cookbooks-tiered-storage.md
+++ b/site2/website/versioned_docs/version-2.7.2/cookbooks-tiered-storage.md
@@ -107,7 +107,7 @@ export
AWS_SECRET_ACCESS_KEY=ded7db27a4558e2ea8bbf0bf37ae0e8521618f366c
3. Add the Java system properties *aws.accessKeyId* and *aws.secretKey* to
**PULSAR_EXTRA_OPTS** in `conf/pulsar_env.sh`.
```bash
-PULSAR_EXTRA_OPTS="${PULSAR_EXTRA_OPTS} ${PULSAR_MEM} ${PULSAR_GC}
-Daws.accessKeyId=ABC123456789
-Daws.secretKey=ded7db27a4558e2ea8bbf0bf37ae0e8521618f366c
-Dio.netty.leakDetectionLevel=disabled
-Dio.netty.recycler.maxCapacity.default=1000
-Dio.netty.recycler.linkCapacity=1024"
+PULSAR_EXTRA_OPTS="${PULSAR_EXTRA_OPTS} ${PULSAR_MEM} ${PULSAR_GC}
-Daws.accessKeyId=ABC123456789
-Daws.secretKey=ded7db27a4558e2ea8bbf0bf37ae0e8521618f366c
-Dio.netty.leakDetectionLevel=disabled
-Dio.netty.recycler.maxCapacityPerThread=4096"
```
4. Set the access credentials in ```~/.aws/credentials```.
diff --git a/site2/website/versioned_docs/version-2.7.2/tiered-storage-aws.md
b/site2/website/versioned_docs/version-2.7.2/tiered-storage-aws.md
index 9c458e13f55..758fd2898ae 100644
--- a/site2/website/versioned_docs/version-2.7.2/tiered-storage-aws.md
+++ b/site2/website/versioned_docs/version-2.7.2/tiered-storage-aws.md
@@ -146,7 +146,7 @@ Once you have created a set of credentials in the AWS IAM
console, you can confi
* Add the Java system properties `aws.accessKeyId` and `aws.secretKey` to
`PULSAR_EXTRA_OPTS` in `conf/pulsar_env.sh`.
```bash
- PULSAR_EXTRA_OPTS="${PULSAR_EXTRA_OPTS} ${PULSAR_MEM} ${PULSAR_GC}
-Daws.accessKeyId=ABC123456789
-Daws.secretKey=ded7db27a4558e2ea8bbf0bf37ae0e8521618f366c
-Dio.netty.leakDetectionLevel=disabled
-Dio.netty.recycler.maxCapacity.default=1000
-Dio.netty.recycler.linkCapacity=1024"
+ PULSAR_EXTRA_OPTS="${PULSAR_EXTRA_OPTS} ${PULSAR_MEM} ${PULSAR_GC}
-Daws.accessKeyId=ABC123456789
-Daws.secretKey=ded7db27a4558e2ea8bbf0bf37ae0e8521618f366c
-Dio.netty.leakDetectionLevel=disabled
-Dio.netty.recycler.maxCapacityPerThread=4096"
```
* Set the access credentials in `~/.aws/credentials`.
diff --git
a/site2/website/versioned_docs/version-2.7.3/cookbooks-tiered-storage.md
b/site2/website/versioned_docs/version-2.7.3/cookbooks-tiered-storage.md
index 97a05128cad..b655acfbc75 100644
--- a/site2/website/versioned_docs/version-2.7.3/cookbooks-tiered-storage.md
+++ b/site2/website/versioned_docs/version-2.7.3/cookbooks-tiered-storage.md
@@ -107,7 +107,7 @@ export
AWS_SECRET_ACCESS_KEY=ded7db27a4558e2ea8bbf0bf37ae0e8521618f366c
3. Add the Java system properties *aws.accessKeyId* and *aws.secretKey* to
**PULSAR_EXTRA_OPTS** in `conf/pulsar_env.sh`.
```bash
-PULSAR_EXTRA_OPTS="${PULSAR_EXTRA_OPTS} ${PULSAR_MEM} ${PULSAR_GC}
-Daws.accessKeyId=ABC123456789
-Daws.secretKey=ded7db27a4558e2ea8bbf0bf37ae0e8521618f366c
-Dio.netty.leakDetectionLevel=disabled
-Dio.netty.recycler.maxCapacity.default=1000
-Dio.netty.recycler.linkCapacity=1024"
+PULSAR_EXTRA_OPTS="${PULSAR_EXTRA_OPTS} ${PULSAR_MEM} ${PULSAR_GC}
-Daws.accessKeyId=ABC123456789
-Daws.secretKey=ded7db27a4558e2ea8bbf0bf37ae0e8521618f366c
-Dio.netty.leakDetectionLevel=disabled
-Dio.netty.recycler.maxCapacityPerThread=4096"
```
4. Set the access credentials in ```~/.aws/credentials```.
diff --git a/site2/website/versioned_docs/version-2.7.3/tiered-storage-aws.md
b/site2/website/versioned_docs/version-2.7.3/tiered-storage-aws.md
index 782d4beac4b..b7e09a4c536 100644
--- a/site2/website/versioned_docs/version-2.7.3/tiered-storage-aws.md
+++ b/site2/website/versioned_docs/version-2.7.3/tiered-storage-aws.md
@@ -146,7 +146,7 @@ Once you have created a set of credentials in the AWS IAM
console, you can confi
* Add the Java system properties `aws.accessKeyId` and `aws.secretKey` to
`PULSAR_EXTRA_OPTS` in `conf/pulsar_env.sh`.
```bash
- PULSAR_EXTRA_OPTS="${PULSAR_EXTRA_OPTS} ${PULSAR_MEM} ${PULSAR_GC}
-Daws.accessKeyId=ABC123456789
-Daws.secretKey=ded7db27a4558e2ea8bbf0bf37ae0e8521618f366c
-Dio.netty.leakDetectionLevel=disabled
-Dio.netty.recycler.maxCapacity.default=1000
-Dio.netty.recycler.linkCapacity=1024"
+ PULSAR_EXTRA_OPTS="${PULSAR_EXTRA_OPTS} ${PULSAR_MEM} ${PULSAR_GC}
-Daws.accessKeyId=ABC123456789
-Daws.secretKey=ded7db27a4558e2ea8bbf0bf37ae0e8521618f366c
-Dio.netty.leakDetectionLevel=disabled
-Dio.netty.recycler.maxCapacityPerThread=4096"
```
* Set the access credentials in `~/.aws/credentials`.
diff --git
a/site2/website/versioned_docs/version-2.7.0/cookbooks-tiered-storage.md
b/site2/website/versioned_docs/version-2.7.4/cookbooks-tiered-storage.md
similarity index 95%
copy from site2/website/versioned_docs/version-2.7.0/cookbooks-tiered-storage.md
copy to site2/website/versioned_docs/version-2.7.4/cookbooks-tiered-storage.md
index 3d63f20c782..0c2bf65ddcf 100644
--- a/site2/website/versioned_docs/version-2.7.0/cookbooks-tiered-storage.md
+++ b/site2/website/versioned_docs/version-2.7.4/cookbooks-tiered-storage.md
@@ -1,5 +1,5 @@
---
-id: version-2.7.0-cookbooks-tiered-storage
+id: version-2.7.4-cookbooks-tiered-storage
title: Tiered Storage
sidebar_label: Tiered Storage
original_id: cookbooks-tiered-storage
@@ -7,13 +7,9 @@ original_id: cookbooks-tiered-storage
Pulsar's **Tiered Storage** feature allows older backlog data to be offloaded
to long term storage, thereby freeing up space in BookKeeper and reducing
storage costs. This cookbook walks you through using tiered storage in your
Pulsar cluster.
-* Tiered storage uses [Apache jclouds](https://jclouds.apache.org) to support
-[Amazon S3](https://aws.amazon.com/s3/) and [Google Cloud
Storage](https://cloud.google.com/storage/)(GCS for short)
-for long term storage. With Jclouds, it is easy to add support for more
-[cloud storage
providers](https://jclouds.apache.org/reference/providers/#blobstore-providers)
in the future.
+* Tiered storage uses [Apache jclouds](https://jclouds.apache.org) to support
[Amazon S3](https://aws.amazon.com/s3/) and [Google Cloud
Storage](https://cloud.google.com/storage/)(GCS for short) for long term
storage. With Jclouds, it is easy to add support for more [cloud storage
providers](https://jclouds.apache.org/reference/providers/#blobstore-providers)
in the future.
-* Tiered storage uses [Apache Hadoop](http://hadoop.apache.org/) to support
filesystem for long term storage.
-With Hadoop, it is easy to add support for more filesystem in the future.
+* Tiered storage uses [Apache Hadoop](http://hadoop.apache.org/) to support
filesystem for long term storage. With Hadoop, it is easy to add support for
more filesystem in the future.
## When should I use Tiered Storage?
@@ -107,7 +103,7 @@ export
AWS_SECRET_ACCESS_KEY=ded7db27a4558e2ea8bbf0bf37ae0e8521618f366c
3. Add the Java system properties *aws.accessKeyId* and *aws.secretKey* to
**PULSAR_EXTRA_OPTS** in `conf/pulsar_env.sh`.
```bash
-PULSAR_EXTRA_OPTS="${PULSAR_EXTRA_OPTS} ${PULSAR_MEM} ${PULSAR_GC}
-Daws.accessKeyId=ABC123456789
-Daws.secretKey=ded7db27a4558e2ea8bbf0bf37ae0e8521618f366c
-Dio.netty.leakDetectionLevel=disabled
-Dio.netty.recycler.maxCapacity.default=1000
-Dio.netty.recycler.linkCapacity=1024"
+PULSAR_EXTRA_OPTS="${PULSAR_EXTRA_OPTS} ${PULSAR_MEM} ${PULSAR_GC}
-Daws.accessKeyId=ABC123456789
-Daws.secretKey=ded7db27a4558e2ea8bbf0bf37ae0e8521618f366c
-Dio.netty.leakDetectionLevel=disabled
-Dio.netty.recycler.maxCapacityPerThread=4096"
```
4. Set the access credentials in ```~/.aws/credentials```.
@@ -297,5 +293,5 @@ Error in offload
null
Reason: Error offloading:
org.apache.bookkeeper.mledger.ManagedLedgerException:
java.util.concurrent.CompletionException:
com.amazonaws.services.s3.model.AmazonS3Exception: Anonymous users cannot
initiate multipart uploads. Please authenticate. (Service: Amazon S3; Status
Code: 403; Error Code: AccessDenied; Request ID: 798758DE3F1776DF; S3 Extended
Request ID:
dhBFz/lZm1oiG/oBEepeNlhrtsDlzoOhocuYMpKihQGXe6EG8puRGOkK6UwqzVrMXTWBxxHcS+g=),
S3 Extended Request ID: dhBFz/lZm1oiG/oBEepeNlhr [...]
-````
+```
diff --git a/site2/website/versioned_docs/version-2.7.3/tiered-storage-aws.md
b/site2/website/versioned_docs/version-2.7.4/tiered-storage-aws.md
similarity index 98%
copy from site2/website/versioned_docs/version-2.7.3/tiered-storage-aws.md
copy to site2/website/versioned_docs/version-2.7.4/tiered-storage-aws.md
index 782d4beac4b..a29f92d2627 100644
--- a/site2/website/versioned_docs/version-2.7.3/tiered-storage-aws.md
+++ b/site2/website/versioned_docs/version-2.7.4/tiered-storage-aws.md
@@ -1,5 +1,5 @@
---
-id: version-2.7.3-tiered-storage-aws
+id: version-2.7.4-tiered-storage-aws
title: Use AWS S3 offloader with Pulsar
sidebar_label: AWS S3 offloader
original_id: tiered-storage-aws
@@ -50,7 +50,6 @@ This example uses Pulsar 2.5.1.
As shown from the output, Pulsar uses [Apache
jclouds](https://jclouds.apache.org) to support [AWS
S3](https://aws.amazon.com/s3/) and [GCS](https://cloud.google.com/storage/)
for long term storage.
-
```
tiered-storage-file-system-2.5.1.nar
tiered-storage-jcloud-2.5.1.nar
@@ -146,7 +145,7 @@ Once you have created a set of credentials in the AWS IAM
console, you can confi
* Add the Java system properties `aws.accessKeyId` and `aws.secretKey` to
`PULSAR_EXTRA_OPTS` in `conf/pulsar_env.sh`.
```bash
- PULSAR_EXTRA_OPTS="${PULSAR_EXTRA_OPTS} ${PULSAR_MEM} ${PULSAR_GC}
-Daws.accessKeyId=ABC123456789
-Daws.secretKey=ded7db27a4558e2ea8bbf0bf37ae0e8521618f366c
-Dio.netty.leakDetectionLevel=disabled
-Dio.netty.recycler.maxCapacity.default=1000
-Dio.netty.recycler.linkCapacity=1024"
+ PULSAR_EXTRA_OPTS="${PULSAR_EXTRA_OPTS} ${PULSAR_MEM} ${PULSAR_GC}
-Daws.accessKeyId=ABC123456789
-Daws.secretKey=ded7db27a4558e2ea8bbf0bf37ae0e8521618f366c
-Dio.netty.leakDetectionLevel=disabled
-Dio.netty.recycler.maxCapacityPerThread=4096"
```
* Set the access credentials in `~/.aws/credentials`.
@@ -257,7 +256,6 @@ For individual topics, you can trigger AWS S3 offloader
manually using one of th
Offload was a success
```
-
If there is an error in offloading, the error is propagated to the
`pulsar-admin topics offload-status` command.
```bash
@@ -271,7 +269,7 @@ For individual topics, you can trigger AWS S3 offloader
manually using one of th
null
Reason: Error offloading:
org.apache.bookkeeper.mledger.ManagedLedgerException:
java.util.concurrent.CompletionException:
com.amazonaws.services.s3.model.AmazonS3Exception: Anonymous users cannot
initiate multipart uploads. Please authenticate. (Service: Amazon S3; Status
Code: 403; Error Code: AccessDenied; Request ID: 798758DE3F1776DF; S3 Extended
Request ID:
dhBFz/lZm1oiG/oBEepeNlhrtsDlzoOhocuYMpKihQGXe6EG8puRGOkK6UwqzVrMXTWBxxHcS+g=),
S3 Extended Request ID: dhBFz/lZm1oiG/oBEepe [...]
- ````
+ ```
> #### Tip
>
diff --git
a/site2/website/versioned_docs/version-2.8.0/cookbooks-tiered-storage.md
b/site2/website/versioned_docs/version-2.8.0/cookbooks-tiered-storage.md
index 96e8117724d..0a752c8d5b7 100644
--- a/site2/website/versioned_docs/version-2.8.0/cookbooks-tiered-storage.md
+++ b/site2/website/versioned_docs/version-2.8.0/cookbooks-tiered-storage.md
@@ -107,7 +107,7 @@ export
AWS_SECRET_ACCESS_KEY=ded7db27a4558e2ea8bbf0bf37ae0e8521618f366c
3. Add the Java system properties *aws.accessKeyId* and *aws.secretKey* to
**PULSAR_EXTRA_OPTS** in `conf/pulsar_env.sh`.
```bash
-PULSAR_EXTRA_OPTS="${PULSAR_EXTRA_OPTS} ${PULSAR_MEM} ${PULSAR_GC}
-Daws.accessKeyId=ABC123456789
-Daws.secretKey=ded7db27a4558e2ea8bbf0bf37ae0e8521618f366c
-Dio.netty.leakDetectionLevel=disabled
-Dio.netty.recycler.maxCapacity.default=1000
-Dio.netty.recycler.linkCapacity=1024"
+PULSAR_EXTRA_OPTS="${PULSAR_EXTRA_OPTS} ${PULSAR_MEM} ${PULSAR_GC}
-Daws.accessKeyId=ABC123456789
-Daws.secretKey=ded7db27a4558e2ea8bbf0bf37ae0e8521618f366c
-Dio.netty.leakDetectionLevel=disabled
-Dio.netty.recycler.maxCapacityPerThread=4096"
```
4. Set the access credentials in ```~/.aws/credentials```.
diff --git a/site2/website/versioned_docs/version-2.8.0/tiered-storage-aws.md
b/site2/website/versioned_docs/version-2.8.0/tiered-storage-aws.md
index e319985ebc6..41415cbe259 100644
--- a/site2/website/versioned_docs/version-2.8.0/tiered-storage-aws.md
+++ b/site2/website/versioned_docs/version-2.8.0/tiered-storage-aws.md
@@ -146,7 +146,7 @@ Once you have created a set of credentials in the AWS IAM
console, you can confi
* Add the Java system properties `aws.accessKeyId` and `aws.secretKey` to
`PULSAR_EXTRA_OPTS` in `conf/pulsar_env.sh`.
```bash
- PULSAR_EXTRA_OPTS="${PULSAR_EXTRA_OPTS} ${PULSAR_MEM} ${PULSAR_GC}
-Daws.accessKeyId=ABC123456789
-Daws.secretKey=ded7db27a4558e2ea8bbf0bf37ae0e8521618f366c
-Dio.netty.leakDetectionLevel=disabled
-Dio.netty.recycler.maxCapacity.default=1000
-Dio.netty.recycler.linkCapacity=1024"
+ PULSAR_EXTRA_OPTS="${PULSAR_EXTRA_OPTS} ${PULSAR_MEM} ${PULSAR_GC}
-Daws.accessKeyId=ABC123456789
-Daws.secretKey=ded7db27a4558e2ea8bbf0bf37ae0e8521618f366c
-Dio.netty.leakDetectionLevel=disabled
-Dio.netty.recycler.maxCapacityPerThread=4096"
```
* Set the access credentials in `~/.aws/credentials`.
diff --git
a/site2/website/versioned_docs/version-2.8.1/cookbooks-tiered-storage.md
b/site2/website/versioned_docs/version-2.8.1/cookbooks-tiered-storage.md
index 6a3d538706e..e4f4f1ea381 100644
--- a/site2/website/versioned_docs/version-2.8.1/cookbooks-tiered-storage.md
+++ b/site2/website/versioned_docs/version-2.8.1/cookbooks-tiered-storage.md
@@ -107,7 +107,7 @@ export
AWS_SECRET_ACCESS_KEY=ded7db27a4558e2ea8bbf0bf37ae0e8521618f366c
3. Add the Java system properties *aws.accessKeyId* and *aws.secretKey* to
**PULSAR_EXTRA_OPTS** in `conf/pulsar_env.sh`.
```bash
-PULSAR_EXTRA_OPTS="${PULSAR_EXTRA_OPTS} ${PULSAR_MEM} ${PULSAR_GC}
-Daws.accessKeyId=ABC123456789
-Daws.secretKey=ded7db27a4558e2ea8bbf0bf37ae0e8521618f366c
-Dio.netty.leakDetectionLevel=disabled
-Dio.netty.recycler.maxCapacity.default=1000
-Dio.netty.recycler.linkCapacity=1024"
+PULSAR_EXTRA_OPTS="${PULSAR_EXTRA_OPTS} ${PULSAR_MEM} ${PULSAR_GC}
-Daws.accessKeyId=ABC123456789
-Daws.secretKey=ded7db27a4558e2ea8bbf0bf37ae0e8521618f366c
-Dio.netty.leakDetectionLevel=disabled
-Dio.netty.recycler.maxCapacityPerThread=4096"
```
4. Set the access credentials in ```~/.aws/credentials```.
diff --git a/site2/website/versioned_docs/version-2.8.1/tiered-storage-aws.md
b/site2/website/versioned_docs/version-2.8.1/tiered-storage-aws.md
index 399d76dc3b8..d422580a95d 100644
--- a/site2/website/versioned_docs/version-2.8.1/tiered-storage-aws.md
+++ b/site2/website/versioned_docs/version-2.8.1/tiered-storage-aws.md
@@ -146,7 +146,7 @@ Once you have created a set of credentials in the AWS IAM
console, you can confi
* Add the Java system properties `aws.accessKeyId` and `aws.secretKey` to
`PULSAR_EXTRA_OPTS` in `conf/pulsar_env.sh`.
```bash
- PULSAR_EXTRA_OPTS="${PULSAR_EXTRA_OPTS} ${PULSAR_MEM} ${PULSAR_GC}
-Daws.accessKeyId=ABC123456789
-Daws.secretKey=ded7db27a4558e2ea8bbf0bf37ae0e8521618f366c
-Dio.netty.leakDetectionLevel=disabled
-Dio.netty.recycler.maxCapacity.default=1000
-Dio.netty.recycler.linkCapacity=1024"
+ PULSAR_EXTRA_OPTS="${PULSAR_EXTRA_OPTS} ${PULSAR_MEM} ${PULSAR_GC}
-Daws.accessKeyId=ABC123456789
-Daws.secretKey=ded7db27a4558e2ea8bbf0bf37ae0e8521618f366c
-Dio.netty.leakDetectionLevel=disabled
-Dio.netty.recycler.maxCapacityPerThread=4096"
```
* Set the access credentials in `~/.aws/credentials`.
diff --git
a/site2/website/versioned_docs/version-2.8.2/cookbooks-tiered-storage.md
b/site2/website/versioned_docs/version-2.8.2/cookbooks-tiered-storage.md
index 52f3eec7e94..e295672c9c1 100644
--- a/site2/website/versioned_docs/version-2.8.2/cookbooks-tiered-storage.md
+++ b/site2/website/versioned_docs/version-2.8.2/cookbooks-tiered-storage.md
@@ -107,7 +107,7 @@ export
AWS_SECRET_ACCESS_KEY=ded7db27a4558e2ea8bbf0bf37ae0e8521618f366c
3. Add the Java system properties *aws.accessKeyId* and *aws.secretKey* to
**PULSAR_EXTRA_OPTS** in `conf/pulsar_env.sh`.
```bash
-PULSAR_EXTRA_OPTS="${PULSAR_EXTRA_OPTS} ${PULSAR_MEM} ${PULSAR_GC}
-Daws.accessKeyId=ABC123456789
-Daws.secretKey=ded7db27a4558e2ea8bbf0bf37ae0e8521618f366c
-Dio.netty.leakDetectionLevel=disabled
-Dio.netty.recycler.maxCapacity.default=1000
-Dio.netty.recycler.linkCapacity=1024"
+PULSAR_EXTRA_OPTS="${PULSAR_EXTRA_OPTS} ${PULSAR_MEM} ${PULSAR_GC}
-Daws.accessKeyId=ABC123456789
-Daws.secretKey=ded7db27a4558e2ea8bbf0bf37ae0e8521618f366c
-Dio.netty.leakDetectionLevel=disabled
-Dio.netty.recycler.maxCapacityPerThread=4096"
```
4. Set the access credentials in ```~/.aws/credentials```.
diff --git a/site2/website/versioned_docs/version-2.8.2/tiered-storage-aws.md
b/site2/website/versioned_docs/version-2.8.2/tiered-storage-aws.md
index 14002be60d8..454613f5647 100644
--- a/site2/website/versioned_docs/version-2.8.2/tiered-storage-aws.md
+++ b/site2/website/versioned_docs/version-2.8.2/tiered-storage-aws.md
@@ -146,7 +146,7 @@ Once you have created a set of credentials in the AWS IAM
console, you can confi
* Add the Java system properties `aws.accessKeyId` and `aws.secretKey` to
`PULSAR_EXTRA_OPTS` in `conf/pulsar_env.sh`.
```bash
- PULSAR_EXTRA_OPTS="${PULSAR_EXTRA_OPTS} ${PULSAR_MEM} ${PULSAR_GC}
-Daws.accessKeyId=ABC123456789
-Daws.secretKey=ded7db27a4558e2ea8bbf0bf37ae0e8521618f366c
-Dio.netty.leakDetectionLevel=disabled
-Dio.netty.recycler.maxCapacity.default=1000
-Dio.netty.recycler.linkCapacity=1024"
+ PULSAR_EXTRA_OPTS="${PULSAR_EXTRA_OPTS} ${PULSAR_MEM} ${PULSAR_GC}
-Daws.accessKeyId=ABC123456789
-Daws.secretKey=ded7db27a4558e2ea8bbf0bf37ae0e8521618f366c
-Dio.netty.leakDetectionLevel=disabled
-Dio.netty.recycler.maxCapacityPerThread=4096"
```
* Set the access credentials in `~/.aws/credentials`.
diff --git
a/site2/website/versioned_docs/version-2.8.0/cookbooks-tiered-storage.md
b/site2/website/versioned_docs/version-2.9.0/cookbooks-tiered-storage.md
similarity index 99%
copy from site2/website/versioned_docs/version-2.8.0/cookbooks-tiered-storage.md
copy to site2/website/versioned_docs/version-2.9.0/cookbooks-tiered-storage.md
index 96e8117724d..3bfc5c57b25 100644
--- a/site2/website/versioned_docs/version-2.8.0/cookbooks-tiered-storage.md
+++ b/site2/website/versioned_docs/version-2.9.0/cookbooks-tiered-storage.md
@@ -1,5 +1,5 @@
---
-id: version-2.8.0-cookbooks-tiered-storage
+id: version-2.9.0-cookbooks-tiered-storage
title: Tiered Storage
sidebar_label: Tiered Storage
original_id: cookbooks-tiered-storage
@@ -107,7 +107,7 @@ export
AWS_SECRET_ACCESS_KEY=ded7db27a4558e2ea8bbf0bf37ae0e8521618f366c
3. Add the Java system properties *aws.accessKeyId* and *aws.secretKey* to
**PULSAR_EXTRA_OPTS** in `conf/pulsar_env.sh`.
```bash
-PULSAR_EXTRA_OPTS="${PULSAR_EXTRA_OPTS} ${PULSAR_MEM} ${PULSAR_GC}
-Daws.accessKeyId=ABC123456789
-Daws.secretKey=ded7db27a4558e2ea8bbf0bf37ae0e8521618f366c
-Dio.netty.leakDetectionLevel=disabled
-Dio.netty.recycler.maxCapacity.default=1000
-Dio.netty.recycler.linkCapacity=1024"
+PULSAR_EXTRA_OPTS="${PULSAR_EXTRA_OPTS} ${PULSAR_MEM} ${PULSAR_GC}
-Daws.accessKeyId=ABC123456789
-Daws.secretKey=ded7db27a4558e2ea8bbf0bf37ae0e8521618f366c
-Dio.netty.leakDetectionLevel=disabled
-Dio.netty.recycler.maxCapacityPerThread=4096"
```
4. Set the access credentials in ```~/.aws/credentials```.
diff --git a/site2/docs/tiered-storage-aws.md
b/site2/website/versioned_docs/version-2.9.0/tiered-storage-aws.md
similarity index 98%
copy from site2/docs/tiered-storage-aws.md
copy to site2/website/versioned_docs/version-2.9.0/tiered-storage-aws.md
index 2c3915a3375..bca98872bce 100644
--- a/site2/docs/tiered-storage-aws.md
+++ b/site2/website/versioned_docs/version-2.9.0/tiered-storage-aws.md
@@ -1,7 +1,8 @@
---
-id: tiered-storage-aws
+id: version-2.9.0-tiered-storage-aws
title: Use AWS S3 offloader with Pulsar
sidebar_label: AWS S3 offloader
+original_id: tiered-storage-aws
---
This chapter guides you through every step of installing and configuring the
AWS S3 offloader and using it with Pulsar.
@@ -49,7 +50,6 @@ This example uses Pulsar 2.5.1.
As shown from the output, Pulsar uses [Apache
jclouds](https://jclouds.apache.org) to support [AWS
S3](https://aws.amazon.com/s3/) and [GCS](https://cloud.google.com/storage/)
for long term storage.
-
```
tiered-storage-file-system-2.5.1.nar
tiered-storage-jcloud-2.5.1.nar
@@ -145,7 +145,7 @@ Once you have created a set of credentials in the AWS IAM
console, you can confi
* Add the Java system properties `aws.accessKeyId` and `aws.secretKey` to
`PULSAR_EXTRA_OPTS` in `conf/pulsar_env.sh`.
```bash
- PULSAR_EXTRA_OPTS="${PULSAR_EXTRA_OPTS} ${PULSAR_MEM} ${PULSAR_GC}
-Daws.accessKeyId=ABC123456789
-Daws.secretKey=ded7db27a4558e2ea8bbf0bf37ae0e8521618f366c
-Dio.netty.leakDetectionLevel=disabled
-Dio.netty.recycler.maxCapacity.default=1000
-Dio.netty.recycler.linkCapacity=1024"
+ PULSAR_EXTRA_OPTS="${PULSAR_EXTRA_OPTS} ${PULSAR_MEM} ${PULSAR_GC}
-Daws.accessKeyId=ABC123456789
-Daws.secretKey=ded7db27a4558e2ea8bbf0bf37ae0e8521618f366c
-Dio.netty.leakDetectionLevel=disabled
-Dio.netty.recycler.maxCapacityPerThread=4096"
```
* Set the access credentials in `~/.aws/credentials`.
@@ -256,7 +256,6 @@ For individual topics, you can trigger AWS S3 offloader
manually using one of th
Offload was a success
```
-
If there is an error in offloading, the error is propagated to the
`pulsar-admin topics offload-status` command.
```bash
diff --git
a/site2/website/versioned_docs/version-2.8.0/cookbooks-tiered-storage.md
b/site2/website/versioned_docs/version-2.9.1/cookbooks-tiered-storage.md
similarity index 99%
copy from site2/website/versioned_docs/version-2.8.0/cookbooks-tiered-storage.md
copy to site2/website/versioned_docs/version-2.9.1/cookbooks-tiered-storage.md
index 96e8117724d..e254cab008a 100644
--- a/site2/website/versioned_docs/version-2.8.0/cookbooks-tiered-storage.md
+++ b/site2/website/versioned_docs/version-2.9.1/cookbooks-tiered-storage.md
@@ -1,5 +1,5 @@
---
-id: version-2.8.0-cookbooks-tiered-storage
+id: version-2.9.1-cookbooks-tiered-storage
title: Tiered Storage
sidebar_label: Tiered Storage
original_id: cookbooks-tiered-storage
@@ -107,7 +107,7 @@ export
AWS_SECRET_ACCESS_KEY=ded7db27a4558e2ea8bbf0bf37ae0e8521618f366c
3. Add the Java system properties *aws.accessKeyId* and *aws.secretKey* to
**PULSAR_EXTRA_OPTS** in `conf/pulsar_env.sh`.
```bash
-PULSAR_EXTRA_OPTS="${PULSAR_EXTRA_OPTS} ${PULSAR_MEM} ${PULSAR_GC}
-Daws.accessKeyId=ABC123456789
-Daws.secretKey=ded7db27a4558e2ea8bbf0bf37ae0e8521618f366c
-Dio.netty.leakDetectionLevel=disabled
-Dio.netty.recycler.maxCapacity.default=1000
-Dio.netty.recycler.linkCapacity=1024"
+PULSAR_EXTRA_OPTS="${PULSAR_EXTRA_OPTS} ${PULSAR_MEM} ${PULSAR_GC}
-Daws.accessKeyId=ABC123456789
-Daws.secretKey=ded7db27a4558e2ea8bbf0bf37ae0e8521618f366c
-Dio.netty.leakDetectionLevel=disabled
-Dio.netty.recycler.maxCapacityPerThread=4096"
```
4. Set the access credentials in ```~/.aws/credentials```.
diff --git a/site2/docs/tiered-storage-aws.md
b/site2/website/versioned_docs/version-2.9.1/tiered-storage-aws.md
similarity index 98%
copy from site2/docs/tiered-storage-aws.md
copy to site2/website/versioned_docs/version-2.9.1/tiered-storage-aws.md
index 2c3915a3375..ccfd0378b92 100644
--- a/site2/docs/tiered-storage-aws.md
+++ b/site2/website/versioned_docs/version-2.9.1/tiered-storage-aws.md
@@ -1,7 +1,8 @@
---
-id: tiered-storage-aws
+id: version-2.9.1-tiered-storage-aws
title: Use AWS S3 offloader with Pulsar
sidebar_label: AWS S3 offloader
+original_id: tiered-storage-aws
---
This chapter guides you through every step of installing and configuring the
AWS S3 offloader and using it with Pulsar.
@@ -49,7 +50,6 @@ This example uses Pulsar 2.5.1.
As shown from the output, Pulsar uses [Apache
jclouds](https://jclouds.apache.org) to support [AWS
S3](https://aws.amazon.com/s3/) and [GCS](https://cloud.google.com/storage/)
for long term storage.
-
```
tiered-storage-file-system-2.5.1.nar
tiered-storage-jcloud-2.5.1.nar
@@ -145,7 +145,7 @@ Once you have created a set of credentials in the AWS IAM
console, you can confi
* Add the Java system properties `aws.accessKeyId` and `aws.secretKey` to
`PULSAR_EXTRA_OPTS` in `conf/pulsar_env.sh`.
```bash
- PULSAR_EXTRA_OPTS="${PULSAR_EXTRA_OPTS} ${PULSAR_MEM} ${PULSAR_GC}
-Daws.accessKeyId=ABC123456789
-Daws.secretKey=ded7db27a4558e2ea8bbf0bf37ae0e8521618f366c
-Dio.netty.leakDetectionLevel=disabled
-Dio.netty.recycler.maxCapacity.default=1000
-Dio.netty.recycler.linkCapacity=1024"
+ PULSAR_EXTRA_OPTS="${PULSAR_EXTRA_OPTS} ${PULSAR_MEM} ${PULSAR_GC}
-Daws.accessKeyId=ABC123456789
-Daws.secretKey=ded7db27a4558e2ea8bbf0bf37ae0e8521618f366c
-Dio.netty.leakDetectionLevel=disabled
-Dio.netty.recycler.maxCapacityPerThread=4096"
```
* Set the access credentials in `~/.aws/credentials`.
@@ -256,7 +256,6 @@ For individual topics, you can trigger AWS S3 offloader
manually using one of th
Offload was a success
```
-
If there is an error in offloading, the error is propagated to the
`pulsar-admin topics offload-status` command.
```bash
